From fac097e784b4e853084980eb52dc86834260908c Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Sat, 29 Jun 2024 09:51:33 +0200 Subject: [PATCH] fix: nginx ssl directive deprecated --- docker/nginx/alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/5.6/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.0/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.1/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.2/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.3/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/7.4/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.0/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.1/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.2/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf | 1 - docker/php-nginx/8.3/conf/etc/nginx/vhost.conf | 4 ++-- docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf | 1 - provisioning/nginx/general/etc/nginx/vhost.conf | 4 ++-- provisioning/nginx/general/etc/nginx/vhost.ssl.conf | 1 - 40 files changed, 40 insertions(+), 60 deletions(-) diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/nginx/alpine/conf/etc/nginx/vhost.conf +++ b/docker/nginx/alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf b/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/nginx/alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/5.6/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.0/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.1-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.1/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.2-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.2/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.2/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.3-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.3/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.3/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.4-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/7.4/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/7.4/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.0-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.0/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.1-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.1/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.2-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.2/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.2/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf +++ b/docker/php-nginx/8.3/conf/etc/nginx/vhost.ssl.conf @@ -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; diff --git a/provisioning/nginx/general/etc/nginx/vhost.conf b/provisioning/nginx/general/etc/nginx/vhost.conf index 109fbb31b..b4df6d710 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.conf @@ -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 _ docker; diff --git a/provisioning/nginx/general/etc/nginx/vhost.ssl.conf b/provisioning/nginx/general/etc/nginx/vhost.ssl.conf index 4ddba251d..28e8aab17 100644 --- a/provisioning/nginx/general/etc/nginx/vhost.ssl.conf +++ b/provisioning/nginx/general/etc/nginx/vhost.ssl.conf @@ -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;