Fix template mappings

kubernetes · Sep 26, 2017 · 6ee2b72 · 6ee2b72
1 parent d73edb8
commit 6ee2b72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
@@ -706,5 +706,5 @@ func trustProxyProtocol(input interface{}) bool {
 	}
 
 	return conf.Cfg.RealClientFrom == "tcp-proxy" ||
-		(conf.Cfg.RealClientFrom == "auto" && !conf.Cfg.UseProxyProtocol)
+		(conf.Cfg.RealClientFrom == "auto" && conf.Cfg.UseProxyProtocol)
 }
diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -151,7 +151,7 @@ http {
         ''               close;
     }
 
-    {{ if (trustHTTPHeaders $cfg) }}
+    {{ if (trustHTTPHeaders $all) }}
     # Trust HTTP X-Forwarded-* Headers, but use direct values if they're missing.
     map {{ buildForwardedFor $cfg.ForwardedForHeader }} $the_real_ip {
         # Get IP address from X-Forwarded-For HTTP header
@@ -391,7 +391,7 @@ http {
 
         {{ template "CUSTOM_ERRORS" $all }}
     }
-    
+
     {{ if $server.Alias }}
     server {
         server_name {{ $server.Alias }};