From b85055a976bdb9bcc3f560128b95455feba1988f Mon Sep 17 00:00:00 2001
From: Max Laverse <max@laverse.net>
Date: Sat, 28 Oct 2017 17:02:16 +0200
Subject: [PATCH] Fix full XFF with PROXY

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

diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index c8577698c..bd793d6d7 100644
--- 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 }}