|
@@ -1,5 +1,8 @@
|
|
|
{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }}
|
|
{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }}
|
|
|
|
|
|
|
|
|
|
+{{ $external_http_port := coalesce $.Env.HTTP_PORT "80" }}
|
|
|
|
|
+{{ $external_https_port := coalesce $.Env.HTTPS_PORT "443" }}
|
|
|
|
|
+
|
|
|
{{ define "upstream" }}
|
|
{{ define "upstream" }}
|
|
|
{{ if .Address }}
|
|
{{ if .Address }}
|
|
|
{{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}}
|
|
{{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}}
|
|
@@ -138,9 +141,9 @@ proxy_set_header Proxy "";
|
|
|
{{ $enable_ipv6 := eq (or ($.Env.ENABLE_IPV6) "") "true" }}
|
|
{{ $enable_ipv6 := eq (or ($.Env.ENABLE_IPV6) "") "true" }}
|
|
|
server {
|
|
server {
|
|
|
server_name _; # This is just an invalid value which will never trigger on a real hostname.
|
|
server_name _; # This is just an invalid value which will never trigger on a real hostname.
|
|
|
- listen 80;
|
|
|
|
|
|
|
+ listen {{ $external_http_port }};
|
|
|
{{ if $enable_ipv6 }}
|
|
{{ if $enable_ipv6 }}
|
|
|
- listen [::]:80;
|
|
|
|
|
|
|
+ listen [::]:{{ $external_http_port }};
|
|
|
{{ end }}
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
return 503;
|
|
return 503;
|
|
@@ -149,9 +152,9 @@ server {
|
|
|
{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
|
|
{{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
|
|
|
server {
|
|
server {
|
|
|
server_name _; # This is just an invalid value which will never trigger on a real hostname.
|
|
server_name _; # This is just an invalid value which will never trigger on a real hostname.
|
|
|
- listen 443 ssl http2;
|
|
|
|
|
|
|
+ listen {{ $external_https_port }} ssl http2;
|
|
|
{{ if $enable_ipv6 }}
|
|
{{ if $enable_ipv6 }}
|
|
|
- listen [::]:443 ssl http2;
|
|
|
|
|
|
|
+ listen [::]:{{ $external_https_port }} ssl http2;
|
|
|
{{ end }}
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
return 503;
|
|
return 503;
|
|
@@ -241,9 +244,9 @@ upstream {{ $upstream_name }} {
|
|
|
{{ if eq $https_method "redirect" }}
|
|
{{ if eq $https_method "redirect" }}
|
|
|
server {
|
|
server {
|
|
|
server_name {{ $host }};
|
|
server_name {{ $host }};
|
|
|
- listen 80 {{ $default_server }};
|
|
|
|
|
|
|
+ listen {{ $external_http_port }} {{ $default_server }};
|
|
|
{{ if $enable_ipv6 }}
|
|
{{ if $enable_ipv6 }}
|
|
|
- listen [::]:80 {{ $default_server }};
|
|
|
|
|
|
|
+ listen [::]:{{ $external_http_port }} {{ $default_server }};
|
|
|
{{ end }}
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
return 301 https://$host$request_uri;
|
|
return 301 https://$host$request_uri;
|
|
@@ -252,9 +255,9 @@ server {
|
|
|
|
|
|
|
|
server {
|
|
server {
|
|
|
server_name {{ $host }};
|
|
server_name {{ $host }};
|
|
|
- listen 443 ssl http2 {{ $default_server }};
|
|
|
|
|
|
|
+ listen {{ $external_https_port }} ssl http2 {{ $default_server }};
|
|
|
{{ if $enable_ipv6 }}
|
|
{{ if $enable_ipv6 }}
|
|
|
- listen [::]:443 ssl http2 {{ $default_server }};
|
|
|
|
|
|
|
+ listen [::]:{{ $external_https_port }} ssl http2 {{ $default_server }};
|
|
|
{{ end }}
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
|
|
|
|
@@ -322,7 +325,7 @@ server {
|
|
|
|
|
|
|
|
server {
|
|
server {
|
|
|
server_name {{ $host }};
|
|
server_name {{ $host }};
|
|
|
- listen 80 {{ $default_server }};
|
|
|
|
|
|
|
+ listen {{ $external_http_port }} {{ $default_server }};
|
|
|
{{ if $enable_ipv6 }}
|
|
{{ if $enable_ipv6 }}
|
|
|
listen [::]:80 {{ $default_server }};
|
|
listen [::]:80 {{ $default_server }};
|
|
|
{{ end }}
|
|
{{ end }}
|
|
@@ -365,9 +368,9 @@ server {
|
|
|
{{ if (and (not $is_https) (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
|
|
{{ if (and (not $is_https) (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }}
|
|
|
server {
|
|
server {
|
|
|
server_name {{ $host }};
|
|
server_name {{ $host }};
|
|
|
- listen 443 ssl http2 {{ $default_server }};
|
|
|
|
|
|
|
+ listen {{ $external_https_port }} ssl http2 {{ $default_server }};
|
|
|
{{ if $enable_ipv6 }}
|
|
{{ if $enable_ipv6 }}
|
|
|
- listen [::]:443 ssl http2 {{ $default_server }};
|
|
|
|
|
|
|
+ listen [::]:{{ $external_https_port }} ssl http2 {{ $default_server }};
|
|
|
{{ end }}
|
|
{{ end }}
|
|
|
access_log /var/log/nginx/access.log vhost;
|
|
access_log /var/log/nginx/access.log vhost;
|
|
|
return 500;
|
|
return 500;
|
nanawel