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

Initialize proxy_upstream_name variable

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-09-29 12:02:45 -03:00
parent e74b8039a5
commit 75dd1d3c6a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controllers/nginx/nginx.tmpl
View file

@ -41,7 +41,7 @@ http {
# lua section to return proper error codes when custom pages are used # lua section to return proper error codes when custom pages are used
lua_package_path '.?.lua;./etc/nginx/lua/?.lua;/etc/nginx/lua/vendor/lua-resty-http/lib/?.lua;'; lua_package_path '.?.lua;./etc/nginx/lua/?.lua;/etc/nginx/lua/vendor/lua-resty-http/lib/?.lua;';
init_by_lua_block { init_by_lua_block {
require("error_page") require("error_page")
} }
@ -185,7 +185,7 @@ http {
listen 80{{ if $cfg.useProxyProtocol }} proxy_protocol{{ end }}; listen 80{{ if $cfg.useProxyProtocol }} proxy_protocol{{ end }};
{{ if $server.SSL }}listen 443 {{ if $cfg.useProxyProtocol }}proxy_protocol{{ end }} ssl {{ if $cfg.enableSpdy }}spdy{{ end }} {{ if $cfg.useHttp2 }}http2{{ end }}; {{ if $server.SSL }}listen 443 {{ if $cfg.useProxyProtocol }}proxy_protocol{{ end }} ssl {{ if $cfg.enableSpdy }}spdy{{ end }} {{ if $cfg.useHttp2 }}http2{{ end }};
{{/* comment PEM sha is required to detect changes in the generated configuration and force a reload */}} {{/* comment PEM sha is required to detect changes in the generated configuration and force a reload */}}
# PEM sha: {{ $server.SSLPemChecksum }} # PEM sha: {{ $server.SSLPemChecksum }}
ssl_certificate {{ $server.SSLCertificate }}; ssl_certificate {{ $server.SSLCertificate }};
ssl_certificate_key {{ $server.SSLCertificateKey }}; ssl_certificate_key {{ $server.SSLCertificateKey }};
{{- end }} {{- end }}
@ -314,6 +314,7 @@ http {
} }
location / { location / {
set $proxy_upstream_name "upstream-default-backend";
proxy_pass http://upstream-default-backend; proxy_pass http://upstream-default-backend;
} }
{{- template "CUSTOM_ERRORS" $cfg }} {{- template "CUSTOM_ERRORS" $cfg }}
@ -322,6 +323,7 @@ http {
# default server for services without endpoints # default server for services without endpoints
server { server {
listen 8181; listen 8181;
set $proxy_upstream_name "-";
location / { location / {
{{ if .customErrors }} {{ if .customErrors }}
@ -331,7 +333,7 @@ http {
{{ else }} {{ else }}
return 503; return 503;
{{ end }} {{ end }}
} }
} }
} }