Merge pull request #1204 from aledbf/fix-template

aledbf · web-flow · commit a5eac354bbb6 · 2017-08-21T15:38:29.000-04:00
Fix template error
diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -573,7 +573,7 @@ stream {
 
         {{ if isLocationAllowed $location }}
         {{ if gt (len $location.Whitelist.CIDR) 0 }}
-        if ({{ buildDenyVariable (print .Hostname "_"  $path) }}) {
+        if ({{ buildDenyVariable (print $server.Hostname "_"  $path) }}) {
         return 403;
         }
         {{ end }}
diff --git a/controllers/nginx/test/data/config.json b/controllers/nginx/test/data/config.json
@@ -96,7 +96,7 @@
 				"sslRedirect": true
 			},
 			"whitelist": {
-				"cidr": []
+				"cidr": ["1.1.1.1"]
 			},
 			"proxy": {
 				"conectTimeout": 5,
@@ -146,7 +146,7 @@
 				"sslRedirect": false
 			},
 			"whitelist": {
-				"cidr": null
+				"cidr": ["1.1.1.1"]
 			},
 			"proxy": {
 				"conectTimeout": 5,

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ stream {`
`573`	`573`
`574`	`574`	`{{ if isLocationAllowed $location }}`
`575`	`575`	`{{ if gt (len $location.Whitelist.CIDR) 0 }}`
`576`		`- if ({{ buildDenyVariable (print .Hostname "_" $path) }}) {`
	`576`	`+ if ({{ buildDenyVariable (print $server.Hostname "_" $path) }}) {`
`577`	`577`	`return 403;`
`578`	`578`	`}`
`579`	`579`	`{{ end }}`