From 4d76b3d6bdc3aac347eacb21b463662e3ac8bd88 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 1 Sep 2020 15:00:06 +0200 Subject: [PATCH] Update to 2020-09-01 15:00 --- roles/nginx/defaults/main.yml | 3 +++ roles/nginx/templates/ansible_conf.d/10-ssl.conf.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index 38e9a94..9817f47 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -87,6 +87,9 @@ nginx_maintenance_ip: [] nginx_ssl_ciphers_modern: 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256' nginx_ssl_ciphers_compat: 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS' +nginx_ssl_protocols: + - TLSv1.2 + - TLSv1.3 # List of ip/cidr which won't have any DOS limit nginx_dos_whitelisted_ip: [] diff --git a/roles/nginx/templates/ansible_conf.d/10-ssl.conf.j2 b/roles/nginx/templates/ansible_conf.d/10-ssl.conf.j2 index 087a545..30b41c1 100644 --- a/roles/nginx/templates/ansible_conf.d/10-ssl.conf.j2 +++ b/roles/nginx/templates/ansible_conf.d/10-ssl.conf.j2 @@ -2,7 +2,7 @@ ssl_certificate {{ nginx_cert_path }}; ssl_certificate_key {{ nginx_key_path }}; ssl_dhparam /etc/nginx/ssl/dhparam.pem; ssl_ciphers {{ nginx_ssl_ciphers_compat }}; -ssl_protocols TLSv1.2 TLSv1.3; +ssl_protocols {{ nginx_ssl_protocols | join(' ') }}; ssl_session_cache shared:SSL:10m; ssl_session_timeout 1h; ssl_session_tickets off;