From 52b45d74cb9535330b5f73d0a03b7b14df9f9a48 Mon Sep 17 00:00:00 2001 From: Cosmin Stroe Date: Thu, 3 Aug 2017 22:24:14 -0500 Subject: [PATCH 1/5] Use correct port number for the upstream. --- plugins/nginx-vhosts/templates/nginx.conf.sigil | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 50df0aae6..181f8d8c0 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -119,6 +119,6 @@ upstream {{ $.APP }}-{{ $upstream_port }} { {{ $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 }} From 65990068cb0bbb8ddb988fcac7799bcada1c4299 Mon Sep 17 00:00:00 2001 From: Cosmin Stroe Date: Fri, 4 Aug 2017 00:24:12 -0500 Subject: [PATCH 2/5] Revert "Use correct port number for the upstream." This reverts commit 52b45d74cb9535330b5f73d0a03b7b14df9f9a48. --- plugins/nginx-vhosts/templates/nginx.conf.sigil | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 181f8d8c0..50df0aae6 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -119,6 +119,6 @@ upstream {{ $.APP }}-{{ $upstream_port }} { {{ $listener_list := $listeners | split ":" }} {{ $listener_ip := index $listener_list 0 }} {{ $listener_port := index $listener_list 1 }} - server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} + server {{ $listener_ip }}:{{ $listener_port }};{{ end }} } {{ end }}{{ end }} From 1f93169c436ef08afaba2d2c655c2f9720f65bff Mon Sep 17 00:00:00 2001 From: Cosmin Stroe Date: Fri, 4 Aug 2017 02:21:31 -0500 Subject: [PATCH 3/5] Fix upstream ports configuration. --- docs/configuration/nginx.md | 7 ++----- plugins/nginx-vhosts/functions | 4 +--- plugins/nginx-vhosts/templates/nginx.conf.sigil | 7 ++----- tests/unit/test_helper.bash | 10 ++-------- 4 files changed, 7 insertions(+), 21 deletions(-) diff --git a/docs/configuration/nginx.md b/docs/configuration/nginx.md index fd7bf6db4..ed8007079 100644 --- a/docs/configuration/nginx.md +++ b/docs/configuration/nginx.md @@ -174,11 +174,8 @@ server { {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} 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 }} +{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }} + server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} } {{ end }} ``` diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index b41a69921..3e22c1a5d 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -219,10 +219,8 @@ nginx_build_config() { shopt -s nullglob local DOKKU_APP_IP_FILE for DOKKU_APP_IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do - local DOKKU_APP_PORT_FILE="${DOKKU_APP_IP_FILE//IP/PORT}" local DOKKU_APP_LISTENER_IP=$(< "$DOKKU_APP_IP_FILE") - local DOKKU_APP_LISTENER_PORT=$(< "$DOKKU_APP_PORT_FILE") - local DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP:$DOKKU_APP_LISTENER_PORT " + local DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP " done local DOKKU_APP_LISTENERS="$(echo "$DOKKU_APP_LISTENERS" | xargs)" shopt -u nullglob diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 50df0aae6..104f8ea70 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -115,10 +115,7 @@ server { {{ if $.DOKKU_APP_LISTENERS }} {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} 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 }} +{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }} + server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} } {{ end }}{{ end }} diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index 2614c284d..47f37fd23 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -302,10 +302,7 @@ server { {{ if $.DOKKU_APP_LISTENERS }} {{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} 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 }} +{{ range \$listener_ip := $.DOKKU_APP_LISTENERS | split " " }} server {{ \$listener_ip }}:{{ \$upstream_port }};{{ end }} } {{ end }}{{ end }} @@ -349,10 +346,7 @@ server { {{ if $.DOKKU_APP_LISTENERS }} {{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} 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 }} +{{ range \$listener_ip := $.DOKKU_APP_LISTENERS | split " " }} server {{ \$listener_ip }}:{{ \$upstream_port }};{{ end }} } {{ end }}{{ end }} From 9156dea8b7b5c93fe6d7c5b70eb219347195939b Mon Sep 17 00:00:00 2001 From: Cosmin Stroe Date: Fri, 4 Aug 2017 12:20:35 -0500 Subject: [PATCH 4/5] Revert "Fix upstream ports configuration." This reverts commit 1f93169c436ef08afaba2d2c655c2f9720f65bff. --- docs/configuration/nginx.md | 7 +++++-- plugins/nginx-vhosts/functions | 4 +++- plugins/nginx-vhosts/templates/nginx.conf.sigil | 7 +++++-- tests/unit/test_helper.bash | 10 ++++++++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/configuration/nginx.md b/docs/configuration/nginx.md index ed8007079..fd7bf6db4 100644 --- a/docs/configuration/nginx.md +++ b/docs/configuration/nginx.md @@ -174,8 +174,11 @@ server { {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} upstream {{ $.APP }}-{{ $upstream_port }} { -{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }} - server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} +{{ 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 }} } {{ end }} ``` diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 3e22c1a5d..b41a69921 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -219,8 +219,10 @@ nginx_build_config() { shopt -s nullglob local DOKKU_APP_IP_FILE for DOKKU_APP_IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do + local DOKKU_APP_PORT_FILE="${DOKKU_APP_IP_FILE//IP/PORT}" local DOKKU_APP_LISTENER_IP=$(< "$DOKKU_APP_IP_FILE") - local DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP " + local DOKKU_APP_LISTENER_PORT=$(< "$DOKKU_APP_PORT_FILE") + local DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP:$DOKKU_APP_LISTENER_PORT " done local DOKKU_APP_LISTENERS="$(echo "$DOKKU_APP_LISTENERS" | xargs)" shopt -u nullglob diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 104f8ea70..50df0aae6 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -115,7 +115,10 @@ server { {{ if $.DOKKU_APP_LISTENERS }} {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} upstream {{ $.APP }}-{{ $upstream_port }} { -{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }} - server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} +{{ 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 }} } {{ end }}{{ end }} diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index 47f37fd23..2614c284d 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -302,7 +302,10 @@ server { {{ if $.DOKKU_APP_LISTENERS }} {{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} upstream {{ $.APP }}-{{ \$upstream_port }} { -{{ range \$listener_ip := $.DOKKU_APP_LISTENERS | split " " }} +{{ 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 }} @@ -346,7 +349,10 @@ server { {{ if $.DOKKU_APP_LISTENERS }} {{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} upstream {{ $.APP }}-{{ \$upstream_port }} { -{{ range \$listener_ip := $.DOKKU_APP_LISTENERS | split " " }} +{{ 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 }} From 0b2bea3fa979fa163b67b69b14c317366b84ebfc Mon Sep 17 00:00:00 2001 From: Cosmin Stroe Date: Fri, 4 Aug 2017 12:26:35 -0500 Subject: [PATCH 5/5] 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 }}