|
@@ -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) }}
|
|
|
|
|
- include /etc/nginx/vhost.d/default
|
|
|
|
|
|
|
+ {{ else if (exists "/etc/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)) }}
|
|
|
|
|
- include {{ printf "/etc/nginx/vhost.d/%s_location"}}
|
|
|
|
|
- {{ else if (exists /etc/vhost.d/default_location) }}
|
|
|
|
|
- include /etc/nginx/vhost.d/default_location
|
|
|
|
|
- {{ end }}
|
|
|
|
|
|
|
+ {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
|
|
|
|
|
+ include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
|
|
|
|
|
+ {{ else if (exists "/etc/vhost.d/default_location") }}
|
|
|
|
|
+ include /etc/nginx/vhost.d/default_location;
|
|
|
|
|
+ {{ 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) }}
|
|
|
|
|
- include /etc/nginx/vhost.d/default
|
|
|
|
|
|
|
+ {{ else if (exists "/etc/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)) }}
|
|
|
|
|
- include {{ printf "/etc/nginx/vhost.d/%s_location"}}
|
|
|
|
|
- {{ else if (exists /etc/vhost.d/default_location) }}
|
|
|
|
|
- include /etc/nginx/vhost.d/default_location
|
|
|
|
|
- {{ end }}
|
|
|
|
|
|
|
+ {{ if (exists (printf "/etc/nginx/vhost.d/%s_location" $host)) }}
|
|
|
|
|
+ include {{ printf "/etc/nginx/vhost.d/%s_location" $host}};
|
|
|
|
|
+ {{ else if (exists "/etc/vhost.d/default_location") }}
|
|
|
|
|
+ include /etc/nginx/vhost.d/default_location;
|
|
|
|
|
+ {{ end }}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
CoreOS Admin