Bring nginx SSL proto/cipher lists up to date, and make them configur…

…able (#10)
AcroMedia · Apr 22, 2021 · a4de1d2 · a4de1d2
1 parent 8573ae7
commit a4de1d2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -26,3 +26,19 @@ letsencrypt_renew_cron_day: "*"
 letsencrypt_webroot: /var/www/letsencrypt
 
 letsencrypt_install_certbot_from_ppa: false
+
+le_nginx_ssl_protocols_default:
+  - TLSv1.2
+
+le_nginx_ssl_ciphers_default:
+  - 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
+  - '!DSS'
diff --git a/templates/etc/nginx/sites-available/default.LE.j2 b/templates/etc/nginx/sites-available/default.LE.j2
@@ -22,8 +22,8 @@ server {
   ssl_certificate /etc/letsencrypt/live/{{ default_site_fqdn }}/fullchain.pem;
   ssl_certificate_key /etc/letsencrypt/live/{{ default_site_fqdn }}/privkey.pem;
   ssl_dhparam /usr/local/ssl/private/dhparams.pem;
-  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-  ssl_ciphers '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';
+  ssl_protocols {{ le_nginx_ssl_protocols_default | join (' ')}};
+  ssl_ciphers '{{ le_nginx_ssl_ciphers_default | join(':') }}';
   ssl_prefer_server_ciphers on;
   #  # HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
   ## Don't enable this unless you know what it does, and what the downside will be if you have to serve plain HTTP at some point.