commit 5ea19a668be4fa34d2a416aa5bebedbc24b7ac7f
author Martin Polreich <polreichmartin@gmail.com> Fri Oct 04 16:50:16 2019 +0200
committer Martin Polreich <polreichmartin@gmail.com> Mon Oct 07 12:54:06 2019 +0200
tree 8ab42c9db44bd273a272950f7a017f21b088b4ca
parent eb14177543767082b103a894f5985bdd98d323d9

Enable 'option forwardfor' by default

Related: PROD-30813
Related: PROD-30814

Change-Id: I3e71cc72001ad038bb558e2953f1cc4603c30e30

haproxy/map.jinja

diff --git a/haproxy/map.jinja b/haproxy/map.jinja
index 4167a2f..5443c1e 100644
--- a/haproxy/map.jinja
+++ b/haproxy/map.jinja
@@ -38,13 +38,21 @@
         'pkgs': ['haproxy'],
         'service': 'haproxy',
         'stats_socket': stats_socket_default,
-        'global': global_parameters
+        'global': global_parameters,
+        'forwardfor': {
+            'enabled': true,
+            'except': '127.0.0.1',
+        },
     },
     'RedHat': {
         'pkgs': ['haproxy'],
         'service': 'haproxy',
         'stats_socket': stats_socket_default,
-        'global': global_parameters
+        'global': global_parameters,
+        'forwardfor': {
+            'enabled': true,
+            'except': '127.0.0.1',
+        },
     },
 }, merge=salt['pillar.get']('haproxy:proxy')) %}