From fe2386b0a62a4a02d74ecb976b980b0de2d817d8 Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Fri, 29 Sep 2017 09:57:16 -0300
Subject: [PATCH] Cleanup

---
 controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
index fb3a55619..59c247352 100644
--- a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
+++ b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -180,12 +180,7 @@ http {
     map {{ buildForwardedFor $cfg.ForwardedForHeader }} $the_real_ip {
     {{ if (trustProxyProtocol $cfg) }}
         # Get IP address from Proxy Protocol
-    {{ if (ne (len $cfg.ProxyRealIPCIDR) 0) }}
-        # using trusted real IP CIDR
-        default          $realip_remote_addr;
-    {{ else }}
         default          $proxy_protocol_addr;
-    {{ end }}
     {{ else }}
         # Get IP from direct remote address
         default          $realip_remote_addr;
@@ -297,10 +292,12 @@ http {
 
         {{ range $server := $upstream.Endpoints }}server {{ $server.Address | formatIP }}:{{ $server.Port }} max_fails={{ $server.MaxFails }} fail_timeout={{ $server.FailTimeout }};
         {{ end }}
+
     }
 
     {{ end }}
 
+
     upstream {{ $upstream.Name }} {
         # Load balance algorithm; empty for round robin, which is the default
         {{ if ne $cfg.LoadBalanceAlgorithm "round_robin" }}