Fix upstream ports configuration.
This commit is contained in:
@@ -174,11 +174,8 @@ server {
|
|||||||
|
|
||||||
{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
|
{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
|
||||||
upstream {{ $.APP }}-{{ $upstream_port }} {
|
upstream {{ $.APP }}-{{ $upstream_port }} {
|
||||||
{{ range $listeners := $.DOKKU_APP_LISTENERS | split " " }}
|
{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }}
|
||||||
{{ $listener_list := $listeners | split ":" }}
|
server {{ $listener_ip }}:{{ $upstream_port }};{{ end }}
|
||||||
{{ $listener_ip := index $listener_list 0 }}
|
|
||||||
{{ $listener_port := index $listener_list 1 }}
|
|
||||||
server {{ $listener_ip }}:{{ $listener_port }};{{ end }}
|
|
||||||
}
|
}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -219,10 +219,8 @@ 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_LISTENER_PORT=$(< "$DOKKU_APP_PORT_FILE")
|
local DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP "
|
||||||
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,10 +115,7 @@ 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 $listeners := $.DOKKU_APP_LISTENERS | split " " }}
|
{{ range $listener_ip := $.DOKKU_APP_LISTENERS | split " " }}
|
||||||
{{ $listener_list := $listeners | split ":" }}
|
server {{ $listener_ip }}:{{ $upstream_port }};{{ end }}
|
||||||
{{ $listener_ip := index $listener_list 0 }}
|
|
||||||
{{ $listener_port := index $listener_list 1 }}
|
|
||||||
server {{ $listener_ip }}:{{ $listener_port }};{{ end }}
|
|
||||||
}
|
}
|
||||||
{{ end }}{{ end }}
|
{{ end }}{{ end }}
|
||||||
|
|||||||
@@ -302,10 +302,7 @@ 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 \$listeners := $.DOKKU_APP_LISTENERS | split " " }}
|
{{ range \$listener_ip := $.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 }}
|
||||||
@@ -349,10 +346,7 @@ 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 \$listeners := $.DOKKU_APP_LISTENERS | split " " }}
|
{{ range \$listener_ip := $.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 }}
|
||||||
|
|||||||
Reference in New Issue
Block a user