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

Merge pull request #1204 from aledbf/fix-template

Browse source 
Fix template error
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-08-21 15:38:29 -04:00 committed by GitHub
commit a5eac354bb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
View file

@ -573,7 +573,7 @@ stream {
{{ if isLocationAllowed $location }} {{ if isLocationAllowed $location }}
{{ if gt (len $location.Whitelist.CIDR) 0 }} {{ if gt (len $location.Whitelist.CIDR) 0 }}
if ({{ buildDenyVariable (print .Hostname "_" $path) }}) { if ({{ buildDenyVariable (print $server.Hostname "_" $path) }}) {
return 403; return 403;
} }
{{ end }} {{ end }}

4
controllers/nginx/test/data/config.json
View file

@ -96,7 +96,7 @@
"sslRedirect": true "sslRedirect": true
}, },
"whitelist": { "whitelist": {
"cidr": [] "cidr": ["1.1.1.1"]
}, },
"proxy": { "proxy": {
"conectTimeout": 5, "conectTimeout": 5,
@ -146,7 +146,7 @@
"sslRedirect": false "sslRedirect": false
}, },
"whitelist": { "whitelist": {
"cidr": null "cidr": ["1.1.1.1"]
}, },
"proxy": { "proxy": {
"conectTimeout": 5, "conectTimeout": 5,