From 0b2bea3fa979fa163b67b69b14c317366b84ebfc Mon Sep 17 00:00:00 2001 From: Cosmin Stroe Date: Fri, 4 Aug 2017 12:26:35 -0500 Subject: [PATCH] Use upstream port in nginx.conf template --- docs/configuration/nginx.md | 3 +-- plugins/nginx-vhosts/templates/nginx.conf.sigil | 3 +-- tests/unit/test_helper.bash | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/configuration/nginx.md b/docs/configuration/nginx.md index fd7bf6db4..089e8e693 100644 --- a/docs/configuration/nginx.md +++ b/docs/configuration/nginx.md @@ -177,8 +177,7 @@ upstream {{ $.APP }}-{{ $upstream_port }} { {{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }} {{ $listener_list := $listeners | split ":" }} {{ $listener_ip := index $listener_list 0 }} -{{ $listener_port := index $listener_list 1 }} - server {{ $listener_ip }}:{{ $listener_port }};{{ end }} + server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} } {{ end }} ``` diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 50df0aae6..c05ed954d 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -118,7 +118,6 @@ upstream {{ $.APP }}-{{ $upstream_port }} { {{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }} {{ $listener_list := $listeners | split ":" }} {{ $listener_ip := index $listener_list 0 }} -{{ $listener_port := index $listener_list 1 }} - server {{ $listener_ip }}:{{ $listener_port }};{{ end }} + server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} } {{ end }}{{ end }} diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index 2614c284d..2583d5d75 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -305,7 +305,6 @@ upstream {{ $.APP }}-{{ \$upstream_port }} { {{ range \$listeners := $.DOKKU_APP_LISTENERS | split " " }} {{ \$listener_list := \$listeners | split ":" }} {{ \$listener_ip := index \$listener_list 0 }} -{{ \$listener_port := index \$listener_list 1 }} server {{ \$listener_ip }}:{{ \$upstream_port }};{{ end }} } {{ end }}{{ end }} @@ -352,7 +351,6 @@ upstream {{ $.APP }}-{{ \$upstream_port }} { {{ range \$listeners := $.DOKKU_APP_LISTENERS | split " " }} {{ \$listener_list := \$listeners | split ":" }} {{ \$listener_ip := index \$listener_list 0 }} -{{ \$listener_port := index \$listener_list 1 }} server {{ \$listener_ip }}:{{ \$upstream_port }};{{ end }} } {{ end }}{{ end }}