zombi/nginx-proxy
Archived
11
0
Fork 0
Code Issues Pull requests Releases Activity

Fix bugs in config file from refactor

Browse source
This commit is contained in:
CoreOS Admin 2015-08-29 18:38:43 -06:00
parent 5089bf77dd
commit ae0da36d75
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nginx.tmpl
View file

@ -125,8 +125,8 @@ server {
{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }} {{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
include {{ printf "/etc/nginx/vhost.d/%s" $host }}; include {{ printf "/etc/nginx/vhost.d/%s" $host }};
{{ else if (exists /etc/vhost.d/default) }} {{ else if (exists "/etc/vhost.d/default") }}
include /etc/nginx/vhost.d/default include /etc/nginx/vhost.d/default;
{{ end }} {{ end }}
location / { location / {
@ -135,11 +135,11 @@ server {
auth_basic "Restricted {{ $host }}"; auth_basic "Restricted {{ $host }}";
auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }}; auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};
{{ end }} {{ end }}
{{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }} {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
include {{ printf "/etc/nginx/vhost.d/%s_location"}} include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
{{ else if (exists /etc/vhost.d/default_location) }} {{ else if (exists "/etc/vhost.d/default_location") }}
include /etc/nginx/vhost.d/default_location include /etc/nginx/vhost.d/default_location;
{{ end }} {{ end }}
} }
} }
{{ else }} {{ else }}
@ -150,8 +150,8 @@ server {
{{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }} {{ if (exists (printf "/etc/nginx/vhost.d/%s" $host)) }}
include {{ printf "/etc/nginx/vhost.d/%s" $host }}; include {{ printf "/etc/nginx/vhost.d/%s" $host }};
{{ else if (exists /etc/vhost.d/default) }} {{ else if (exists "/etc/vhost.d/default") }}
include /etc/nginx/vhost.d/default include /etc/nginx/vhost.d/default;
{{ end }} {{ end }}
location / { location / {
@ -160,11 +160,11 @@ server {
auth_basic "Restricted {{ $host }}"; auth_basic "Restricted {{ $host }}";
auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }}; auth_basic_user_file {{ (printf "/etc/nginx/htpasswd/%s" $host) }};
{{ end }} {{ end }}
{{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }} {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
include {{ printf "/etc/nginx/vhost.d/%s_location"}} include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
{{ else if (exists /etc/vhost.d/default_location) }} {{ else if (exists "/etc/vhost.d/default_location") }}
include /etc/nginx/vhost.d/default_location include /etc/nginx/vhost.d/default_location;
{{ end }} {{ end }}
} }
} }