Merge pull request #1618 from maxlaverse/fix_fullforwardedfor_with_us…

…eproxy Fix full XFF with PROXY
kubernetes · Oct 28, 2017 · 2a9e1eb · 2a9e1eb
2 parents 9d91572 + b85055a
commit 2a9e1eb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
@@ -214,8 +214,13 @@ http {
     # We can't use $proxy_add_x_forwarded_for because the realip module
     # replaces the remote_addr too soon
     map $http_x_forwarded_for $full_x_forwarded_for {
+        {{ if $all.Cfg.UseProxyProtocol }}
+        default          "$http_x_forwarded_for, $proxy_protocol_addr";
+        ''               "$proxy_protocol_addr";
+        {{ else }}
         default          "$http_x_forwarded_for, $realip_remote_addr";
         ''               "$realip_remote_addr";
+        {{ end}}
     }
     {{ end }}