DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'master/master' into docs

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-10-13 18:17:38 -03:00
commit a30d3775c4
2 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -362,16 +362,7 @@ http {
{{ range $index, $server := $servers }}
server {
server_name {{ $server.Hostname }};
{{ template "SERVER" serverConfig $all $server }}
{{ template "CUSTOM_ERRORS" $all }}
}
{{ if $server.Alias }}
server {
server_name {{ $server.Alias }};
server_name {{ $server.Hostname }} {{ $server.Alias }};
{{ template "SERVER" serverConfig $all $server }}
{{ if not (empty $cfg.ServerSnippet) }}
@ -382,7 +373,6 @@ http {
{{ template "CUSTOM_ERRORS" $all }}
}
{{ end }}
{{ end }}
# default server, used for NGINX healthcheck and access to nginx stats
server {
@ -832,7 +822,7 @@ stream {
return 503;
{{ end }}
}
{{ end }}
{{ if eq $server.Hostname "_" }}