Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix semicolons in global configuration #1477

Merged
merged 1 commit into from
Oct 5, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ http {

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

{{ range $name, $upstream := $backends }}
Expand Down Expand Up @@ -401,7 +401,7 @@ http {

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

{{ template "CUSTOM_ERRORS" $all }}
Expand Down Expand Up @@ -818,7 +818,7 @@ stream {

{{ if not (empty $all.Cfg.LocationSnippet) }}
# Custom code snippet configured in the configuration configmap
{{ $all.Cfg.LocationSnippet }};
{{ $all.Cfg.LocationSnippet }}
{{ end }}

{{/* if we are sending the request to a custom default backend, we add the required headers */}}
Expand Down