Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fallback to empty string when VIRTUAL_PATH_STRIP not specified

Browse source
This commit is contained in:
Peter Badida 2020-01-19 21:08:04 +01:00
parent 416050f1c6
commit 9b38175c06
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nginx.tmpl
View file

@ -297,20 +297,20 @@ server {
{{ $is_regexp := hasPrefix "^" $location }} {{ $is_regexp := hasPrefix "^" $location }}
{{ $modifier := when $is_regexp "~" "" }} {{ $modifier := when $is_regexp "~" "" }}
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
location {{ $modifier }} '{{ $location }}' { location {{ $modifier }} '{{ $location }}' {
return 302 '{{ $location }}/'; return 302 '{{ $location }}/';
} }
{{ end }} {{ end }}
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
location {{ $modifier }} '{{ $location }}/' { location {{ $modifier }} '{{ $location }}/' {
{{ else }} {{ else }}
location {{ $modifier }} '{{ $location }}' { location {{ $modifier }} '{{ $location }}' {
{{ end }} {{ end }}
{{ if eq $proto "uwsgi" }} {{ if eq $proto "uwsgi" }}
include uwsgi_params; include uwsgi_params;
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }}/; uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }}/;
{{ else }} {{ else }}
uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }}; uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }};
@ -320,7 +320,7 @@ server {
include fastcgi_params; include fastcgi_params;
fastcgi_pass {{ trim $container.Name }}; fastcgi_pass {{ trim $container.Name }};
{{ else }} {{ else }}
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
proxy_pass {{ trim $proto }}://{{ trim $container.Name }}/; proxy_pass {{ trim $proto }}://{{ trim $container.Name }}/;
{{ else }} {{ else }}
proxy_pass {{ trim $proto }}://{{ trim $container.Name }}; proxy_pass {{ trim $proto }}://{{ trim $container.Name }};
@ -370,20 +370,20 @@ server {
{{ $is_regexp := hasPrefix "^" $location }} {{ $is_regexp := hasPrefix "^" $location }}
{{ $modifier := when $is_regexp "~" "" }} {{ $modifier := when $is_regexp "~" "" }}
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
location {{ $modifier }} '{{ $location }}' { location {{ $modifier }} '{{ $location }}' {
return 302 '{{ $location }}/'; return 302 '{{ $location }}/';
} }
{{ end }} {{ end }}
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
location {{ $modifier }} '{{ $location }}/' { location {{ $modifier }} '{{ $location }}/' {
{{ else }} {{ else }}
location {{ $modifier }} '{{ $location }}' { location {{ $modifier }} '{{ $location }}' {
{{ end }} {{ end }}
{{ if eq $proto "uwsgi" }} {{ if eq $proto "uwsgi" }}
include uwsgi_params; include uwsgi_params;
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }}/; uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }}/;
{{ else }} {{ else }}
uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }}; uwsgi_pass {{ trim $proto }}://{{ trim $container.Name }};
@ -393,7 +393,7 @@ server {
include fastcgi_params; include fastcgi_params;
fastcgi_pass {{ trim $container.Name }}; fastcgi_pass {{ trim $container.Name }};
{{ else }} {{ else }}
{{ if (eq $container.Env.VIRTUAL_PATH_STRIP "true") }} {{ if (eq (or ($container.Env.VIRTUAL_PATH_STRIP) "") "true") }}
proxy_pass {{ trim $proto }}://{{ trim $container.Name }}/; proxy_pass {{ trim $proto }}://{{ trim $container.Name }}/;
{{ else }} {{ else }}
proxy_pass {{ trim $proto }}://{{ trim $container.Name }}; proxy_pass {{ trim $proto }}://{{ trim $container.Name }};