Skip to content

Commit

Permalink
Include the serversnippet from the config map in servers that aren't …
Browse files Browse the repository at this point in the history
…aliaes
  • Loading branch information
Chris Reinhardt committed Oct 12, 2017
1 parent bf26abf commit 0aae811
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion rootfs/etc/nginx/template/nginx.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,10 @@ http {
server_name {{ $server.Hostname }} {{ $server.Alias }};
{{ template "SERVER" serverConfig $all $server }}

{{ if not (empty $cfg.ServerSnippet) }}
# Custom code snippet configured in the configuration configmap
{{ $cfg.ServerSnippet }}
{{ end }}

{{ template "CUSTOM_ERRORS" $all }}
}
Expand Down Expand Up @@ -818,7 +822,7 @@ stream {
return 503;
{{ end }}
}

{{ end }}

{{ if eq $server.Hostname "_" }}
Expand Down

0 comments on commit 0aae811

Please sign in to comment.