|
@@ -147,6 +147,12 @@ upstream {{ $upstream_name }} {
|
|
|
{{/* Get the VIRTUAL_PROTO defined by containers w/ the same vhost, falling back to "http" */}}
|
|
|
{{ $proto := trim (or (first (groupByKeys $containers "Env.VIRTUAL_PROTO")) "http") }}
|
|
|
|
|
|
+{{/* Get the NETWORK_ACCESS defined by containers w/ the same vhost, falling back to "external" */}}
|
|
|
+{{ $network_tag := or (first (groupByKeys $containers "Env.NETWORK_ACCESS")) "external" }}
|
|
|
+
|
|
|
+{{/* Get the NETWORK_ACCESS defined by containers w/ the same vhost, falling back to "external" */}}
|
|
|
+{{ $network_tag := or (first (groupByKeys $containers "Env.NETWORK_ACCESS")) "external" }}
|
|
|
+
|
|
|
{{/* Get the HTTPS_METHOD defined by containers w/ the same vhost, falling back to "redirect" */}}
|
|
|
{{ $https_method := or (first (groupByKeys $containers "Env.HTTPS_METHOD")) "redirect" }}
|
|
|
|
|
@@ -187,6 +193,11 @@ server {
|
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
|
|
|
+ {{ if eq $network_tag "internal" }}
|
|
|
+ # Only allow traffic from internal clients
|
|
|
+ include /etc/nginx/network_internal.conf;
|
|
|
+ {{ end }}
|
|
|
+
|
|
|
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:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:!DSS';
|
|
|
|
|
@@ -230,11 +241,11 @@ server {
|
|
|
auth_basic "Restricted {{ $host }}";
|
|
|
auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};
|
|
|
{{ end }}
|
|
|
- {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
|
|
|
- include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
|
|
|
- {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
|
|
|
- include /etc/nginx/vhost.d/default_location;
|
|
|
- {{ end }}
|
|
|
+ {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
|
|
|
+ include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
|
|
|
+ {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
|
|
|
+ include /etc/nginx/vhost.d/default_location;
|
|
|
+ {{ end }}
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -250,6 +261,11 @@ server {
|
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
|
|
|
+ {{ if eq $network_tag "internal" }}
|
|
|
+ # Only allow traffic from internal clients
|
|
|
+ include /etc/nginx/network_internal.conf;
|
|
|
+ {{ end }}
|
|
|
+
|
|
|
{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
|
|
|
include {{ printf "/etc/nginx/vhost.d/%s" $host }};
|
|
|
{{ else if (exists "/etc/nginx/vhost.d/default") }}
|
|
@@ -267,11 +283,11 @@ server {
|
|
|
auth_basic "Restricted {{ $host }}";
|
|
|
auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};
|
|
|
{{ end }}
|
|
|
- {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
|
|
|
- include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
|
|
|
- {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
|
|
|
- include /etc/nginx/vhost.d/default_location;
|
|
|
- {{ end }}
|
|
|
+ {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
|
|
|
+ include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
|
|
|
+ {{ else if (exists "/etc/nginx/vhost.d/default_location") }}
|
|
|
+ include /etc/nginx/vhost.d/default_location;
|
|
|
+ {{ end }}
|
|
|
}
|
|
|
}
|
|
|
|