summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-06-21 14:40:42 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-06-21 14:40:42 -0400
commit00a7688401c15015c3f43735b2b1536ebfec7e92 (patch)
tree4bad80f5a9b73d14683385bf8fc19e1e72997021 /src
parent2e6a2bf5b63b2fb0cd45577772c370414b380617 (diff)
downloadpfsense-00a7688401c15015c3f43735b2b1536ebfec7e92.zip
pfsense-00a7688401c15015c3f43735b2b1536ebfec7e92.tar.gz
Incorporated ssl changes
Diffstat (limited to 'src')
-rwxr-xr-xsrc/etc/rc9
l---------src/usr/local/openssl/openssl.cnf1
2 files changed, 9 insertions, 1 deletions
diff --git a/src/etc/rc b/src/etc/rc
index 92d085b..c60e91e 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -373,6 +373,15 @@ 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
+mkdir -p /usr/local/openssl >/dev/null 2>&1
+ln -sf /etc/ssl/openssl.cnf \
+ /usr/local/openssl/openssl.cnf
+
# 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/usr/local/openssl/openssl.cnf b/src/usr/local/openssl/openssl.cnf
deleted file mode 120000
index f95d25b..0000000
--- a/src/usr/local/openssl/openssl.cnf
+++ /dev/null
@@ -1 +0,0 @@
-../../../etc/ssl/openssl.cnf \ No newline at end of file
OpenPOWER on IntegriCloud