As per pull request feedback, update names to be consistent
This commit is contained in:
parent
d9ee7ed704
commit
405f4876b9
1 changed files with 8 additions and 8 deletions
16
nginx.tmpl
16
nginx.tmpl
|
@ -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/defaults) }}
|
{{ else if (exists /etc/vhost.d/default) }}
|
||||||
include /etc/nginx/vhost.d/defaults
|
include /etc/nginx/vhost.d/default
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
|
@ -137,8 +137,8 @@ server {
|
||||||
{{ 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"}}
|
||||||
{{ else if (exists /etc/vhost.d/defaults_location) }}
|
{{ else if (exists /etc/vhost.d/default_location) }}
|
||||||
include /etc/nginx/vhost.d/defaults_location
|
include /etc/nginx/vhost.d/default_location
|
||||||
{{ end }}
|
{{ end }}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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/defaults) }}
|
{{ else if (exists /etc/vhost.d/default) }}
|
||||||
include /etc/nginx/vhost.d/defaults
|
include /etc/nginx/vhost.d/default
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
|
@ -162,8 +162,8 @@ server {
|
||||||
{{ 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"}}
|
||||||
{{ else if (exists /etc/vhost.d/defaults_location) }}
|
{{ else if (exists /etc/vhost.d/default_location) }}
|
||||||
include /etc/nginx/vhost.d/defaults_location
|
include /etc/nginx/vhost.d/default_location
|
||||||
{{ end }}
|
{{ end }}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue