summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-31 16:54:00 -0300
committerRenato Botelho <renato@netgate.com>2016-05-31 16:54:00 -0300
commit4ecaca5b94d084bb122add172c612151efc9fd14 (patch)
tree20cdbb7d032333af81d6814c4b7e726c1b6748bd
parent6251d51714faa6b1769dce3a3f7aa478acfa1e75 (diff)
downloadpfsense-4ecaca5b94d084bb122add172c612151efc9fd14.zip
pfsense-4ecaca5b94d084bb122add172c612151efc9fd14.tar.gz
Move openssl.cnf to better place and copy it over to /etc/ssl during boot
-rwxr-xr-xsrc/etc/rc6
-rw-r--r--src/usr/local/share/pfSense/ssl/openssl.cnf (renamed from src/etc/ssl/openssl.cnf)0
2 files changed, 6 insertions, 0 deletions
diff --git a/src/etc/rc b/src/etc/rc
index e82a5ba..7464b02 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -373,6 +373,12 @@ echo "done."
# Second upgrade stage
/usr/local/sbin/${product}-upgrade -y -b 2
+# Copy default openssl config file
+[ -d /etc/ssl ] \
+ || mkdir -p /etc/ssl
+[ -f /usr/local/share/${product}/ssl/openssl.cnf ] \
+ && cp -f /usr/local/share/${product}/ssl/openssl.cnf /etc/ssl
+
# Run the php.ini setup file and populate
# /usr/local/etc/php.ini
/etc/rc.php_ini_setup 2>/tmp/php_errors.txt
diff --git a/src/etc/ssl/openssl.cnf b/src/usr/local/share/pfSense/ssl/openssl.cnf
index 6119a73..6119a73 100644
--- a/src/etc/ssl/openssl.cnf
+++ b/src/usr/local/share/pfSense/ssl/openssl.cnf
OpenPOWER on IntegriCloud