Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master

[Haw Loeung]

Back to X-Forwarded-For as some things expect it to be this (e.g. Moin

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Paul Collins (pjdc)]

review: Approve (lgtm)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 9e1d668e53ff85b458917fc955774f2ab45fcd0e

diff --git a/files/nginx-logging-format.conf b/files/nginx-logging-format.conf
index b9df464..a646743 100644
--- a/files/nginx-logging-format.conf
+++ b/files/nginx-logging-format.conf
@@ -1,4 +1,4 @@
-log_format content_cache '$http_x_cache_request_ip - $remote_user [$time_local] '
+log_format content_cache '$http_x_forwarded_for - $remote_user [$time_local] '
                          '"$request" $status $bytes_sent '
                          '"$http_referer" "$http_user_agent" $request_time '
                          '$upstream_cache_status $upstream_response_time '
diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index 9f95727..a215f62 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -281,7 +281,9 @@ def configure_haproxy():  # NOQA: C901 LP#1825084
             # Also, for caching layer, we want higher fall count as it's less
             # likely the caching layer is down, 2 mins here (inter * fall).
             new_cached_loc_conf['backend-fall-count'] = 60
-            new_cached_loc_conf['backend-options'] = ['http-request set-header X-Cache-Request-IP %[src]']
+            # Rather than enable haproxy's 'option forwardfor' we want to replace
+            # the X-F-F header in case it's spoofed.
+            new_cached_loc_conf['backend-options'] = ['http-request set-header X-Forwarded-For %[src]']
 
             # No backends
             if not site_conf['locations'][location].get('backends'):
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
index 658b0d1..b7bb481 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
@@ -157,7 +157,7 @@ listen site9-local
 backend backend-cached-site1-local
     option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
 
@@ -173,7 +173,7 @@ backend backend-site1-local
 backend backend-cached-site2-local
     option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site2.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
 
@@ -189,7 +189,7 @@ backend backend-site2-local
 backend backend-cached-site3-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site3.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
@@ -207,14 +207,14 @@ backend backend-site3-local
 backend backend-cached-site4-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site4.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
 
 backend backend-cached-site5
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site5.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -235,7 +235,7 @@ backend backend-site5-2
 backend backend-cached-site6-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site6.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -249,7 +249,7 @@ backend backend-site6-local
 backend backend-cached-site7-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site7.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -263,7 +263,7 @@ backend backend-site7-local
 backend backend-cached-site8-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site8.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -284,7 +284,7 @@ backend backend-site8-local-2
 backend backend-cached-site9-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site9.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
index 7931e5e..a571e92 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
@@ -92,7 +92,7 @@ listen site1-local
 backend backend-cached-site1-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
index e8536e0..bd66f8d 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
@@ -98,7 +98,7 @@ listen site1-local
 backend backend-cached-site1-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
index 47c5663..d28fd68 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
@@ -157,7 +157,7 @@ listen site9-local
 backend backend-cached-site1-local
     option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
 
@@ -173,7 +173,7 @@ backend backend-site1-local
 backend backend-cached-site2-local
     option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site2.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
 
@@ -189,7 +189,7 @@ backend backend-site2-local
 backend backend-cached-site3-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site3.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
@@ -207,14 +207,14 @@ backend backend-site3-local
 backend backend-cached-site4-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site4.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
 
 backend backend-cached-site5
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site5.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -235,7 +235,7 @@ backend backend-site5-2
 backend backend-cached-site6-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site6.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -249,7 +249,7 @@ backend backend-site6-local
 backend backend-cached-site7-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site7.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -263,7 +263,7 @@ backend backend-site7-local
 backend backend-cached-site8-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site8.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -284,7 +284,7 @@ backend backend-site8-local-2
 backend backend-cached-site9-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site9.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
index b110384..194dd4c 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
@@ -97,7 +97,7 @@ listen site1-local-2
 backend backend-cached-site1-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
index 8ad76cb..09d9c9a 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
@@ -157,7 +157,7 @@ listen site9-local
 backend backend-cached-site1-local
     option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
 
@@ -173,7 +173,7 @@ backend backend-site1-local
 backend backend-cached-site2-local
     option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site2.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
 
@@ -189,7 +189,7 @@ backend backend-site2-local
 backend backend-cached-site3-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site3.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
@@ -207,14 +207,14 @@ backend backend-site3-local
 backend backend-cached-site4-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site4.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
 
 backend backend-cached-site5
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site5.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -235,7 +235,7 @@ backend backend-site5-2
 backend backend-cached-site6-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site6.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -249,7 +249,7 @@ backend backend-site6-local
 backend backend-cached-site7-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site7.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -263,7 +263,7 @@ backend backend-site7-local
 backend backend-cached-site8-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site8.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -284,7 +284,7 @@ backend backend-site8-local-2
 backend backend-cached-site9-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site9.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance roundrobin
     server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
index fb75f2e..5d012fb 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
@@ -158,7 +158,7 @@ listen site9-local
 backend backend-cached-site1-local
     option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
 
@@ -174,7 +174,7 @@ backend backend-site1-local
 backend backend-cached-site2-local
     option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site2.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
 
@@ -190,7 +190,7 @@ backend backend-site2-local
 backend backend-cached-site3-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site3.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
@@ -208,14 +208,14 @@ backend backend-site3-local
 backend backend-cached-site4-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site4.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
 
 backend backend-cached-site5
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site5.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -236,7 +236,7 @@ backend backend-site5-2
 backend backend-cached-site6-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site6.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -250,7 +250,7 @@ backend backend-site6-local
 backend backend-cached-site7-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site7.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -264,7 +264,7 @@ backend backend-site7-local
 backend backend-cached-site8-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site8.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -285,7 +285,7 @@ backend backend-site8-local-2
 backend backend-cached-site9-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site9.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
index f6c4138..97611bf 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
@@ -157,7 +157,7 @@ listen site9-local
 backend backend-cached-site1-local
     option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
 
@@ -174,7 +174,7 @@ backend backend-site1-local
 backend backend-cached-site2-local
     option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site2.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
 
@@ -191,7 +191,7 @@ backend backend-site2-local
 backend backend-cached-site3-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site3.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
@@ -210,14 +210,14 @@ backend backend-site3-local
 backend backend-cached-site4-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site4.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
 
 backend backend-cached-site5
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site5.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -240,7 +240,7 @@ backend backend-site5-2
 backend backend-cached-site6-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site6.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -255,7 +255,7 @@ backend backend-site6-local
 backend backend-cached-site7-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site7.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -270,7 +270,7 @@ backend backend-site7-local
 backend backend-cached-site8-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site8.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
 
@@ -293,7 +293,7 @@ backend backend-site8-local-2
 backend backend-cached-site9-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site9.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
index 72b12df..a88388d 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
@@ -92,7 +92,7 @@ listen site1-local
 backend backend-cached-site1-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
     http-request set-header Host site1.local
-    http-request set-header X-Cache-Request-IP %[src]
+    http-request set-header X-Forwarded-For %[src]
     balance leastconn
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400