Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kipjr committed Jul 6, 2024
2 parents 56f28df + fac097e commit 87fd838
Show file tree
Hide file tree
Showing 40 changed files with 40 additions and 60 deletions.
4 changes: 2 additions & 2 deletions docker/nginx/alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/5.6/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.0/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.1/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.2/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.3/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/7.4/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.0/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.1/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.2/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions docker/php-nginx/8.3/conf/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down
4 changes: 2 additions & 2 deletions provisioning/nginx/general/etc/nginx/vhost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ server {
##############

server {
listen 443 default_server;
listen [::]:443 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;

server_name _ <ALIAS_DOMAIN> docker;

Expand Down
1 change: 0 additions & 1 deletion provisioning/nginx/general/etc/nginx/vhost.ssl.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ssl on;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # not possible to do exclusive
ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
ssl_prefer_server_ciphers on;
Expand Down

0 comments on commit 87fd838

Please sign in to comment.