From 6ee2b726f870e58e6b8bd0874e07c6a0c796ed1a Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Tue, 26 Sep 2017 14:20:36 -0300
Subject: [PATCH] Fix template mappings

---
 controllers/nginx/pkg/template/template.go             | 2 +-
 controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
index 319a8b244e..eca21b54af 100644
--- 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
index d42b6c3af3..f15accd6c8 100644
--- 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 }};