Merge pull request #1204 from aledbf/fix-template

Fix template error
kubernetes · Aug 21, 2017 · a5eac35 · a5eac35
2 parents 827d852 + 884b388
commit a5eac35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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,