diff --git a/environments/staging/terraform.yml b/environments/staging/terraform.yml index 0f280c5978..c378653115 100644 --- a/environments/staging/terraform.yml +++ b/environments/staging/terraform.yml @@ -4,7 +4,7 @@ state_bucket: dimagi-terraform state_bucket_region: "us-east-1" region: "us-east-1" environment: "staging" -ssl_policy: 'ELBSecurityPolicy-FS-1-2-Res-2020-10' +ssl_policy: 'ELBSecurityPolicy-TLS13-1-2-Res-2021-06' azs: - "us-east-1a" - "us-east-1b" diff --git a/src/commcare_cloud/ansible/roles/nginx/vars/main.yml b/src/commcare_cloud/ansible/roles/nginx/vars/main.yml index a609c62750..ad801e46b4 100644 --- a/src/commcare_cloud/ansible/roles/nginx/vars/main.yml +++ b/src/commcare_cloud/ansible/roles/nginx/vars/main.yml @@ -20,7 +20,7 @@ pna_nginx_ssl_key: "{{ deploy_env }}_nginx_pna.org.key" reach_nginx_ssl_cert: "{{ deploy_env }}_nginx_reach_combined.crt" reach_nginx_ssl_key: "{{ deploy_env }}_nginx_reach.org.key" # providing this will ensure that the poodle vulnerability is closed -nginx_ssl_protocols: "TLSv1 TLSv1.1 TLSv1.2" +nginx_ssl_protocols: "TLSv1 TLSv1.1 TLSv1.2 TLSv1.3" # RC4 is needed for J2ME so we have to have it enabled here. # Otherwise, this matches the recommendation given at https://weakdh.org/sysadmin.html nginx_ssl_ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA"