github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2858 from cstroe/issue-2857-nginx-conf-with-multiple-expose-ports

Browse Source 
Use correct port number for the upstream.
This commit is contained in:
Jose Diaz-Gonzalez
2017-08-19 19:08:13 -04:00
committed by GitHub
parent 68e628d384 0b2bea3fa9
commit 5e0ea9c734
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/configuration/nginx.md
View File

@@ -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 }}
```

3
plugins/nginx-vhosts/templates/nginx.conf.sigil
View File

@@ -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 }}

2
tests/unit/test_helper.bash
View File

@@ -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 }}