|
@@ -71,6 +71,7 @@ server {
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
return 503;
|
|
|
|
|
|
+ ssl_session_tickets off;
|
|
|
ssl_certificate /etc/nginx/certs/default.crt;
|
|
|
ssl_certificate_key /etc/nginx/certs/default.key;
|
|
|
}
|
|
@@ -119,8 +120,8 @@ upstream {{ $host }} {
|
|
|
{{ $vhostCert := (closest (dir "/etc/nginx/certs") (printf "%s.crt" $host))}}
|
|
|
|
|
|
{{/* vhostCert is actually a filename so remove any suffixes since they are added later */}}
|
|
|
-{{ $vhostCert := replace $vhostCert ".crt" "" -1 }}
|
|
|
-{{ $vhostCert := replace $vhostCert ".key" "" -1 }}
|
|
|
+{{ $vhostCert := trimSuffix ".crt" $vhostCert }}
|
|
|
+{{ $vhostCert := trimSuffix ".key" $vhostCert }}
|
|
|
|
|
|
{{/* Use the cert specified on the container or fallback to the best vhost match */}}
|
|
|
{{ $cert := (coalesce $certName $vhostCert) }}
|
|
@@ -144,11 +145,12 @@ server {
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
|
|
|
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
|
|
|
- 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;
|
|
|
+ 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_prefer_server_ciphers on;
|
|
|
ssl_session_timeout 5m;
|
|
|
ssl_session_cache shared:SSL:50m;
|
|
|
+ ssl_session_tickets off;
|
|
|
|
|
|
ssl_certificate /etc/nginx/certs/{{ (printf "%s.crt" $cert) }};
|
|
|
ssl_certificate_key /etc/nginx/certs/{{ (printf "%s.key" $cert) }};
|
|
@@ -168,7 +170,12 @@ server {
|
|
|
{{ end }}
|
|
|
|
|
|
location / {
|
|
|
+ {{ if eq $proto "uwsgi" }}
|
|
|
+ include uwsgi_params;
|
|
|
+ uwsgi_pass {{ trim $proto }}://{{ trim $host }};
|
|
|
+ {{ else }}
|
|
|
proxy_pass {{ trim $proto }}://{{ trim $host }};
|
|
|
+ {{ end }}
|
|
|
{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
|
|
|
auth_basic "Restricted {{ $host }}";
|
|
|
auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};
|
|
@@ -197,7 +204,12 @@ server {
|
|
|
{{ end }}
|
|
|
|
|
|
location / {
|
|
|
+ {{ if eq $proto "uwsgi" }}
|
|
|
+ include uwsgi_params;
|
|
|
+ uwsgi_pass {{ trim $proto }}://{{ trim $host }};
|
|
|
+ {{ else }}
|
|
|
proxy_pass {{ trim $proto }}://{{ trim $host }};
|
|
|
+ {{ end }}
|
|
|
{{ if (exists (printf "/etc/nginx/htpasswd/%s" $host)) }}
|
|
|
auth_basic "Restricted {{ $host }}";
|
|
|
auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};
|