summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-06-24 08:13:48 -0300
committerRenato Botelho <renato@netgate.com>2016-06-24 08:14:57 -0300
commit4bcb7a69e28d07b6d9b4a37f10f8c571bee97a8d (patch)
treee47782e0e5869f64865094d6fb7038bfc40ec47f
parent8e8108e680357e65b9fa2916a8a4660cf316e91b (diff)
downloadpfsense-4bcb7a69e28d07b6d9b4a37f10f8c571bee97a8d.zip
pfsense-4bcb7a69e28d07b6d9b4a37f10f8c571bee97a8d.tar.gz
Revert "Incorporated ssl changes"
It's a specific 2.4 change, only in master branch This reverts commit 00a7688401c15015c3f43735b2b1536ebfec7e92.
-rwxr-xr-xsrc/etc/rc9
l---------src/usr/local/openssl/openssl.cnf1
2 files changed, 1 insertions, 9 deletions
diff --git a/src/etc/rc b/src/etc/rc
index c60e91e..92d085b 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -373,15 +373,6 @@ 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
new file mode 120000
index 0000000..f95d25b
--- /dev/null
+++ b/src/usr/local/openssl/openssl.cnf
@@ -0,0 +1 @@
+../../../etc/ssl/openssl.cnf \ No newline at end of file
OpenPOWER on IntegriCloud