Skip to content
Permalink
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
@@ -2375,7 +2375,7 @@ force_advanced_nginx_config () {
_SSL_INSTALLED=`openssl version 2>&1 | tr -d "\n" | cut -d" " -f2 | awk '{ print $1}'`
if [ "$_SSL_INSTALLED" = "$_OPENSSL_VERSION" ] &&[ "$_NGINX_FORWARD_SECRECY" = "YES" ] ; then
_ALLOW_NGINX_FORWARD_SECRECY=YES
_SSL_PROTOCOLS="SSLv3 TLSv1 TLSv1.1 TLSv1.2;"
_SSL_PROTOCOLS="TLSv1 TLSv1.1 TLSv1.2;"
_SSL_CIPHERS="EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH+aRSA+RC4:EECDH:EDH+aRSA:RC4:\!aNULL:\!eNULL:\!LOW:\!3DES:\!MD5:\!EXP:\!PSK:\!SRP:\!DSS:+RC4:RC4;"
else
_ALLOW_NGINX_FORWARD_SECRECY=NO
@@ -9293,7 +9293,8 @@ else
sed -i "s/.*listen .*:443/ listen \*:443/g" /var/aegir/config/server_*/nginx/vhost.d/sqlbuddy.* &> /dev/null
sed -i "s/.*listen .*:443/ listen \*:443/g" /var/aegir/config/server_*/nginx/vhost.d/chive.* &> /dev/null
sed -i "s/.*listen .*:443/ listen \*:443/g" /var/aegir/config/server_*/nginx/vhost.d/cgp.* &> /dev/null
sed -i "s/SSLv3 TLSv1;/SSLv3 TLSv1 TLSv1.1 TLSv1.2;/g" /var/aegir/config/server_*/nginx/pre.d/*.conf &> /dev/null
sed -i "s/SSLv3 TLSv1;/TLSv1 TLSv1.1 TLSv1.2;/g" /var/aegir/config/server_*/nginx/pre.d/*.conf &> /dev/null
sed -i "s/SSLv3 TLSv1 TLSv1.1 TLSv1.2;/TLSv1 TLSv1.1 TLSv1.2;/g" /var/aegir/config/server_*/nginx/pre.d/*.conf &> /dev/null
sed -i "s/HIGH:\!ADH:\!MD5;/RC4:HIGH:\!aNULL:\!MD5;/g" /var/aegir/config/server_*/nginx/pre.d/*.conf &> /dev/null
sed -i "s/.*gzip_vary .*//g" /var/aegir/config/server_*/nginx/pre.d/*.conf &> /dev/null
sed -i "s/.*gzip_vary .*//g" /var/aegir/config/server_*/nginx/vhost.d/* &> /dev/null
@@ -9320,7 +9321,7 @@ else
_SSL_INSTALLED=`openssl version 2>&1 | tr -d "\n" | cut -d" " -f2 | awk '{ print $1}'`
if [ "$_SSL_INSTALLED" = "$_OPENSSL_VERSION" ] &&[ "$_NGINX_FORWARD_SECRECY" = "YES" ] ; then
_ALLOW_NGINX_FORWARD_SECRECY=YES
_SSL_PROTOCOLS="SSLv3 TLSv1 TLSv1.1 TLSv1.2;"
_SSL_PROTOCOLS="TLSv1 TLSv1.1 TLSv1.2;"
_SSL_CIPHERS="EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH+aRSA+RC4:EECDH:EDH+aRSA:RC4:\!aNULL:\!eNULL:\!LOW:\!3DES:\!MD5:\!EXP:\!PSK:\!SRP:\!DSS:+RC4:RC4;"
else
_ALLOW_NGINX_FORWARD_SECRECY=NO
@@ -24,7 +24,7 @@ server {
ssl_certificate /etc/ssl/private/nginx-wild-ssl.crt;
ssl_certificate_key /etc/ssl/private/nginx-wild-ssl.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
keepalive_timeout 70;
@@ -24,7 +24,7 @@ server {
ssl_certificate /etc/ssl/private/nginx-wild-ssl.crt;
ssl_certificate_key /etc/ssl/private/nginx-wild-ssl.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
keepalive_timeout 70;
@@ -24,7 +24,7 @@ server {
ssl_certificate /etc/ssl/private/nginx-wild-ssl.crt;
ssl_certificate_key /etc/ssl/private/nginx-wild-ssl.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
keepalive_timeout 70;
@@ -12,7 +12,7 @@ server {
ssl_certificate /etc/ssl/private/nginx-wild-ssl.crt;
ssl_certificate_key /etc/ssl/private/nginx-wild-ssl.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
keepalive_timeout 70;
@@ -83,7 +83,7 @@ server {
ssl_certificate /etc/ssl/private/abc-ssl-enabled-domain.crt;
ssl_certificate_key /etc/ssl/private/abc-ssl-enabled-domain.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
keepalive_timeout 70;
@@ -126,7 +126,7 @@ server {
ssl_certificate /etc/ssl/private/xyz-ssl-enabled-domain.crt;
ssl_certificate_key /etc/ssl/private/xyz-ssl-enabled-domain.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
keepalive_timeout 70;

0 comments on commit f5ccf4e

Please sign in to comment.