Revert "Fix upstream ports configuration."

This reverts commit 1f93169c43.
This commit is contained in:
Cosmin Stroe committed 2017-08-04 12:20:35 -05:00
1 parent 1f93169c43
commit 9156dea8b7
4 files changed
+21 -7

No files matched your search

+5 -2
View File
@@ -174,8 +174,11 @@ server {
{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
upstream {{ $.APP }}-{{ $upstream_port }} { upstream {{ $.APP }}-{{ $upstream_port }} {
{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }} {{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }}
server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} {{ $listener_list := $listeners | split ":" }}
{{ $listener_ip := index $listener_list 0 }}
{{ $listener_port := index $listener_list 1 }}
server {{ $listener_ip }}:{{ $listener_port }};{{ end }}
} }
{{ end }} {{ end }}
``` ```
+3 -1
View File
@@ -219,8 +219,10 @@ nginx_build_config() {
shopt -s nullglob shopt -s nullglob
local DOKKU_APP_IP_FILE local DOKKU_APP_IP_FILE
for DOKKU_APP_IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do 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_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 done
local DOKKU_APP_LISTENERS="$(echo "$DOKKU_APP_LISTENERS" | xargs)" local DOKKU_APP_LISTENERS="$(echo "$DOKKU_APP_LISTENERS" | xargs)"
shopt -u nullglob shopt -u nullglob
@@ -115,7 +115,10 @@ server {
{{ if $.DOKKU_APP_LISTENERS }} {{ if $.DOKKU_APP_LISTENERS }}
{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} {{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
upstream {{ $.APP }}-{{ $upstream_port }} { upstream {{ $.APP }}-{{ $upstream_port }} {
{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }} {{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }}
server {{ $listener_ip }}:{{ $upstream_port }};{{ end }} {{ $listener_list := $listeners | split ":" }}
{{ $listener_ip := index $listener_list 0 }}
{{ $listener_port := index $listener_list 1 }}
server {{ $listener_ip }}:{{ $listener_port }};{{ end }}
} }
{{ end }}{{ end }} {{ end }}{{ end }}
+8 -2
View File
@@ -302,7 +302,10 @@ server {
{{ if $.DOKKU_APP_LISTENERS }} {{ if $.DOKKU_APP_LISTENERS }}
{{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} {{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
upstream {{ $.APP }}-{{ \$upstream_port }} { 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 }} server {{ \$listener_ip }}:{{ \$upstream_port }};{{ end }}
} }
{{ end }}{{ end }} {{ end }}{{ end }}
@@ -346,7 +349,10 @@ server {
{{ if $.DOKKU_APP_LISTENERS }} {{ if $.DOKKU_APP_LISTENERS }}
{{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }} {{ range \$upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
upstream {{ $.APP }}-{{ \$upstream_port }} { 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 }} server {{ \$listener_ip }}:{{ \$upstream_port }};{{ end }}
} }
{{ end }}{{ end }} {{ end }}{{ end }}