Content Cache Charm

Merge ~hloeung/content-cache-charm:haproxy-config into content-cache-charm:master

  1. Git
  2. lp:~hloeung/content-cache-charm
  3. haproxy-config
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 1d3bc174c9117c4e5f303868088ebe5e606d83aa
Merged at revision: a0b35dbf2535eb3628b76e079005e23d3b1c58f9
Proposed branch: ~hloeung/content-cache-charm:haproxy-config
Merge into: content-cache-charm:master
Diff against target: 1180 lines (+136/-137)
14 files modified
lib/haproxy.py (+1/-2)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+19/-19)
tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+2/-2)
tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+2/-2)
tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+19/-19)
tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt (+3/-3)
tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt (+19/-19)
tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt (+19/-19)
tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt (+19/-19)
tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt (+2/-2)
tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt (+10/-10)
tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt (+1/-1)
tests/unit/files/haproxy_config_rendered_test_output.txt (+10/-10)
tests/unit/files/haproxy_config_rendered_test_output2.txt (+10/-10)
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+396968@code.launchpad.net

Commit message

Remove no-cache in HAProxy health checks

Description of the change

The original MP doesn't explain why it was added:

https://code.launchpad.net/~bloodearnest/content-cache-charm/+git/content-cache-charm/+merge/373822

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Barry Price (barryprice) wrote :

LGTM +1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision a0b35dbf2535eb3628b76e079005e23d3b1c58f9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/haproxy.py b/lib/haproxy.py
2index f76e083..2bf795e 100644
3--- a/lib/haproxy.py
4+++ b/lib/haproxy.py
5@@ -321,8 +321,7 @@ backend backend-{name}
6 httpchk = (
7 r"option httpchk {method} {path} HTTP/1.0\r\n"
8 r"Host:\ {site_name}\r\n"
9- r"User-Agent:\ haproxy/httpchk\r\n"
10- r"Cache-Control:\ no-cache"
11+ r"User-Agent:\ haproxy/httpchk"
12 ).format(method=method, path=path, site_name=site_name)
13
14 output = backend_stanza.format(
15diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
16index 72bc2d3..9f6292d 100644
17--- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
18+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
19@@ -156,14 +156,14 @@ listen site9-local
20
21 backend backend-cached-site1-local
22 option forwardfor
23- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
24+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
25 http-request set-header Host site1.local
26 balance leastconn
27 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
28
29 backend backend-site1-local
30 option redispatch 1
31- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
32+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
33 http-request set-header Host site1.local
34 balance leastconn
35 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
36@@ -172,14 +172,14 @@ backend backend-site1-local
37
38 backend backend-cached-site2-local
39 option forwardfor
40- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
41+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
42 http-request set-header Host site2.local
43 balance leastconn
44 server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
45
46 backend backend-site2-local
47 option redispatch 1
48- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
49+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
50 http-request set-header Host site2.local
51 balance leastconn
52 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
53@@ -188,7 +188,7 @@ backend backend-site2-local
54
55 backend backend-cached-site3-local
56 option forwardfor
57- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
58+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
59 http-request set-header Host site3.local
60 balance leastconn
61 server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
62@@ -197,7 +197,7 @@ backend backend-site3-local
63 option forwardfor except 127.0.0.1
64 option forceclose
65 option redispatch 1
66- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
67+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
68 http-request set-header Host site3.local
69 balance leastconn
70 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
71@@ -206,91 +206,91 @@ backend backend-site3-local
72
73 backend backend-cached-site4-local
74 option forwardfor
75- option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
76+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
77 http-request set-header Host site4.local
78 balance leastconn
79 server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
80
81 backend backend-cached-site5
82 option forwardfor
83- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
84+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
85 http-request set-header Host site5.local
86 balance leastconn
87 server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
88
89 backend backend-site5
90 option redispatch 1
91- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
92+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
93 http-request set-header Host site5.local
94 balance leastconn
95 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
96
97 backend backend-site5-2
98 option redispatch 1
99- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
100+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
101 http-request set-header Host site5.local
102 balance leastconn
103 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
104
105 backend backend-cached-site6-local
106 option forwardfor
107- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
108+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
109 http-request set-header Host site6.local
110 balance leastconn
111 server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
112
113 backend backend-site6-local
114 option redispatch 1
115- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
116+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
117 http-request set-header Host site6.local
118 balance leastconn
119 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
120
121 backend backend-cached-site7-local
122 option forwardfor
123- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
124+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
125 http-request set-header Host site7.local
126 balance leastconn
127 server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
128
129 backend backend-site7-local
130 option redispatch 1
131- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
132+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
133 http-request set-header Host site7.local
134 balance leastconn
135 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
136
137 backend backend-cached-site8-local
138 option forwardfor
139- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
140+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
141 http-request set-header Host site8.local
142 balance leastconn
143 server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
144
145 backend backend-site8-local
146 option redispatch 1
147- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
148+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
149 http-request set-header Host site8.local
150 balance leastconn
151 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
152
153 backend backend-site8-local-2
154 option redispatch 1
155- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
156+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
157 http-request set-header Host auth.site8.local
158 balance leastconn
159 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
160
161 backend backend-cached-site9-local
162 option forwardfor
163- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
164+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
165 http-request set-header Host site9.local
166 balance leastconn
167 server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
168
169 backend backend-site9-local
170 option redispatch 1
171- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
172+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
173 http-request set-header Host site9.local
174 balance leastconn
175 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
176diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
177index a618ceb..22ddfcd 100644
178--- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
179+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
180@@ -91,7 +91,7 @@ listen site1-local
181
182 backend backend-cached-site1-local
183 option forwardfor
184- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
185+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
186 http-request set-header Host site1.local
187 balance leastconn
188 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200
189@@ -99,7 +99,7 @@ backend backend-cached-site1-local
190 backend backend-site1-local
191 retries 3
192 option redispatch 1
193- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
194+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
195 http-request set-header Host site1.local
196 balance leastconn
197 server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200
198diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
199index af75f2c..dd8a6f7 100644
200--- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
201+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
202@@ -97,14 +97,14 @@ listen site1-local
203
204 backend backend-cached-site1-local
205 option forwardfor
206- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
207+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
208 http-request set-header Host site1.local
209 balance leastconn
210 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200
211
212 backend backend-site1-local
213 option redispatch 1
214- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
215+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
216 http-request set-header Host site1.local
217 balance leastconn
218 server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200
219diff --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
220index 25b27e5..8de817a 100644
221--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
222+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
223@@ -156,14 +156,14 @@ listen site9-local
224
225 backend backend-cached-site1-local
226 option forwardfor
227- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
228+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
229 http-request set-header Host site1.local
230 balance leastconn
231 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
232
233 backend backend-site1-local
234 option redispatch 1
235- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
236+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
237 http-request set-header Host site1.local
238 balance leastconn
239 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
240@@ -172,14 +172,14 @@ backend backend-site1-local
241
242 backend backend-cached-site2-local
243 option forwardfor
244- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
245+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
246 http-request set-header Host site2.local
247 balance leastconn
248 server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
249
250 backend backend-site2-local
251 option redispatch 1
252- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
253+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
254 http-request set-header Host site2.local
255 balance leastconn
256 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
257@@ -188,7 +188,7 @@ backend backend-site2-local
258
259 backend backend-cached-site3-local
260 option forwardfor
261- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
262+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
263 http-request set-header Host site3.local
264 balance leastconn
265 server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
266@@ -197,7 +197,7 @@ backend backend-site3-local
267 option forwardfor except 127.0.0.1
268 option forceclose
269 option redispatch 1
270- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
271+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
272 http-request set-header Host site3.local
273 balance leastconn
274 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
275@@ -206,91 +206,91 @@ backend backend-site3-local
276
277 backend backend-cached-site4-local
278 option forwardfor
279- option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
280+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
281 http-request set-header Host site4.local
282 balance leastconn
283 server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
284
285 backend backend-cached-site5
286 option forwardfor
287- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
288+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
289 http-request set-header Host site5.local
290 balance leastconn
291 server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
292
293 backend backend-site5
294 option redispatch 1
295- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
296+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
297 http-request set-header Host site5.local
298 balance leastconn
299 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
300
301 backend backend-site5-2
302 option redispatch 1
303- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
304+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
305 http-request set-header Host site5.local
306 balance leastconn
307 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
308
309 backend backend-cached-site6-local
310 option forwardfor
311- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
312+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
313 http-request set-header Host site6.local
314 balance leastconn
315 server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
316
317 backend backend-site6-local
318 option redispatch 1
319- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
320+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
321 http-request set-header Host site6.local
322 balance leastconn
323 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
324
325 backend backend-cached-site7-local
326 option forwardfor
327- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
328+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
329 http-request set-header Host site7.local
330 balance leastconn
331 server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
332
333 backend backend-site7-local
334 option redispatch 1
335- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
336+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
337 http-request set-header Host site7.local
338 balance leastconn
339 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
340
341 backend backend-cached-site8-local
342 option forwardfor
343- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
344+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
345 http-request set-header Host site8.local
346 balance leastconn
347 server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
348
349 backend backend-site8-local
350 option redispatch 1
351- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
352+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
353 http-request set-header Host site8.local
354 balance leastconn
355 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
356
357 backend backend-site8-local-2
358 option redispatch 1
359- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
360+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
361 http-request set-header Host auth.site8.local
362 balance leastconn
363 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
364
365 backend backend-cached-site9-local
366 option forwardfor
367- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
368+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
369 http-request set-header Host site9.local
370 balance leastconn
371 server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
372
373 backend backend-site9-local
374 option redispatch 1
375- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
376+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
377 http-request set-header Host site9.local
378 balance leastconn
379 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
380diff --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
381index d42878a..aaf84c5 100644
382--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
383+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
384@@ -96,7 +96,7 @@ listen site1-local-2
385
386 backend backend-cached-site1-local
387 option forwardfor
388- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
389+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
390 http-request set-header Host site1.local
391 balance leastconn
392 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400
393@@ -104,7 +104,7 @@ backend backend-cached-site1-local
394 backend backend-site1-local
395 option allbackups
396 option redispatch 1
397- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
398+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
399 http-request set-header Host site1.local
400 balance leastconn
401 server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200
402@@ -112,7 +112,7 @@ backend backend-site1-local
403
404 backend backend-site1-local-2
405 option redispatch 1
406- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
407+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
408 http-request set-header Host site1.local
409 balance leastconn
410 server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200
411diff --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
412index c17ee47..29451b9 100644
413--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
414+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
415@@ -156,14 +156,14 @@ listen site9-local
416
417 backend backend-cached-site1-local
418 option forwardfor
419- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
420+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
421 http-request set-header Host site1.local
422 balance roundrobin
423 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
424
425 backend backend-site1-local
426 option redispatch 1
427- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
428+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
429 http-request set-header Host site1.local
430 balance roundrobin
431 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
432@@ -172,14 +172,14 @@ backend backend-site1-local
433
434 backend backend-cached-site2-local
435 option forwardfor
436- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
437+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
438 http-request set-header Host site2.local
439 balance roundrobin
440 server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
441
442 backend backend-site2-local
443 option redispatch 1
444- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
445+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
446 http-request set-header Host site2.local
447 balance roundrobin
448 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
449@@ -188,7 +188,7 @@ backend backend-site2-local
450
451 backend backend-cached-site3-local
452 option forwardfor
453- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
454+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
455 http-request set-header Host site3.local
456 balance roundrobin
457 server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
458@@ -197,7 +197,7 @@ backend backend-site3-local
459 option forwardfor except 127.0.0.1
460 option forceclose
461 option redispatch 1
462- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
463+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
464 http-request set-header Host site3.local
465 balance roundrobin
466 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
467@@ -206,91 +206,91 @@ backend backend-site3-local
468
469 backend backend-cached-site4-local
470 option forwardfor
471- option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
472+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
473 http-request set-header Host site4.local
474 balance roundrobin
475 server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
476
477 backend backend-cached-site5
478 option forwardfor
479- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
480+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
481 http-request set-header Host site5.local
482 balance roundrobin
483 server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
484
485 backend backend-site5
486 option redispatch 1
487- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
488+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
489 http-request set-header Host site5.local
490 balance roundrobin
491 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
492
493 backend backend-site5-2
494 option redispatch 1
495- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
496+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
497 http-request set-header Host site5.local
498 balance roundrobin
499 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
500
501 backend backend-cached-site6-local
502 option forwardfor
503- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
504+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
505 http-request set-header Host site6.local
506 balance roundrobin
507 server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
508
509 backend backend-site6-local
510 option redispatch 1
511- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
512+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
513 http-request set-header Host site6.local
514 balance roundrobin
515 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
516
517 backend backend-cached-site7-local
518 option forwardfor
519- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
520+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
521 http-request set-header Host site7.local
522 balance roundrobin
523 server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
524
525 backend backend-site7-local
526 option redispatch 1
527- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
528+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
529 http-request set-header Host site7.local
530 balance roundrobin
531 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
532
533 backend backend-cached-site8-local
534 option forwardfor
535- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
536+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
537 http-request set-header Host site8.local
538 balance roundrobin
539 server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
540
541 backend backend-site8-local
542 option redispatch 1
543- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
544+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
545 http-request set-header Host site8.local
546 balance roundrobin
547 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
548
549 backend backend-site8-local-2
550 option redispatch 1
551- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
552+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
553 http-request set-header Host auth.site8.local
554 balance roundrobin
555 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
556
557 backend backend-cached-site9-local
558 option forwardfor
559- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
560+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
561 http-request set-header Host site9.local
562 balance roundrobin
563 server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
564
565 backend backend-site9-local
566 option redispatch 1
567- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
568+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
569 http-request set-header Host site9.local
570 balance roundrobin
571 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
572diff --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
573index a27ff31..ea91f8d 100644
574--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
575+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
576@@ -157,14 +157,14 @@ listen site9-local
577
578 backend backend-cached-site1-local
579 option forwardfor
580- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
581+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
582 http-request set-header Host site1.local
583 balance leastconn
584 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
585
586 backend backend-site1-local
587 option redispatch 1
588- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
589+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
590 http-request set-header Host site1.local
591 balance leastconn
592 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
593@@ -173,14 +173,14 @@ backend backend-site1-local
594
595 backend backend-cached-site2-local
596 option forwardfor
597- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
598+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
599 http-request set-header Host site2.local
600 balance leastconn
601 server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
602
603 backend backend-site2-local
604 option redispatch 1
605- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
606+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
607 http-request set-header Host site2.local
608 balance leastconn
609 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
610@@ -189,7 +189,7 @@ backend backend-site2-local
611
612 backend backend-cached-site3-local
613 option forwardfor
614- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
615+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
616 http-request set-header Host site3.local
617 balance leastconn
618 server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
619@@ -198,7 +198,7 @@ backend backend-site3-local
620 option forwardfor except 127.0.0.1
621 option forceclose
622 option redispatch 1
623- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
624+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
625 http-request set-header Host site3.local
626 balance leastconn
627 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
628@@ -207,91 +207,91 @@ backend backend-site3-local
629
630 backend backend-cached-site4-local
631 option forwardfor
632- option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
633+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
634 http-request set-header Host site4.local
635 balance leastconn
636 server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
637
638 backend backend-cached-site5
639 option forwardfor
640- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
641+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
642 http-request set-header Host site5.local
643 balance leastconn
644 server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
645
646 backend backend-site5
647 option redispatch 1
648- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
649+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
650 http-request set-header Host site5.local
651 balance leastconn
652 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
653
654 backend backend-site5-2
655 option redispatch 1
656- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
657+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
658 http-request set-header Host site5.local
659 balance leastconn
660 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
661
662 backend backend-cached-site6-local
663 option forwardfor
664- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
665+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
666 http-request set-header Host site6.local
667 balance leastconn
668 server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
669
670 backend backend-site6-local
671 option redispatch 1
672- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
673+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
674 http-request set-header Host site6.local
675 balance leastconn
676 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
677
678 backend backend-cached-site7-local
679 option forwardfor
680- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
681+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
682 http-request set-header Host site7.local
683 balance leastconn
684 server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
685
686 backend backend-site7-local
687 option redispatch 1
688- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
689+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
690 http-request set-header Host site7.local
691 balance leastconn
692 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
693
694 backend backend-cached-site8-local
695 option forwardfor
696- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
697+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
698 http-request set-header Host site8.local
699 balance leastconn
700 server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
701
702 backend backend-site8-local
703 option redispatch 1
704- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
705+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
706 http-request set-header Host site8.local
707 balance leastconn
708 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
709
710 backend backend-site8-local-2
711 option redispatch 1
712- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
713+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
714 http-request set-header Host auth.site8.local
715 balance leastconn
716 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
717
718 backend backend-cached-site9-local
719 option forwardfor
720- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
721+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
722 http-request set-header Host site9.local
723 balance leastconn
724 server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
725
726 backend backend-site9-local
727 option redispatch 1
728- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
729+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
730 http-request set-header Host site9.local
731 balance leastconn
732 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
733diff --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
734index 2a6ee1a..ef0a365 100644
735--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
736+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt
737@@ -156,7 +156,7 @@ listen site9-local
738
739 backend backend-cached-site1-local
740 option forwardfor
741- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
742+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
743 http-request set-header Host site1.local
744 balance leastconn
745 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600
746@@ -164,7 +164,7 @@ backend backend-cached-site1-local
747 backend backend-site1-local
748 retry-on all-retryable-errors
749 option redispatch 1
750- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
751+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
752 http-request set-header Host site1.local
753 balance leastconn
754 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
755@@ -173,7 +173,7 @@ backend backend-site1-local
756
757 backend backend-cached-site2-local
758 option forwardfor
759- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
760+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
761 http-request set-header Host site2.local
762 balance leastconn
763 server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072
764@@ -181,7 +181,7 @@ backend backend-cached-site2-local
765 backend backend-site2-local
766 retry-on all-retryable-errors
767 option redispatch 1
768- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
769+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
770 http-request set-header Host site2.local
771 balance leastconn
772 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
773@@ -190,7 +190,7 @@ backend backend-site2-local
774
775 backend backend-cached-site3-local
776 option forwardfor
777- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
778+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
779 http-request set-header Host site3.local
780 balance leastconn
781 server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
782@@ -200,7 +200,7 @@ backend backend-site3-local
783 option forceclose
784 retry-on all-retryable-errors
785 option redispatch 1
786- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
787+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
788 http-request set-header Host site3.local
789 balance leastconn
790 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
791@@ -209,14 +209,14 @@ backend backend-site3-local
792
793 backend backend-cached-site4-local
794 option forwardfor
795- option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
796+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk
797 http-request set-header Host site4.local
798 balance leastconn
799 server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200
800
801 backend backend-cached-site5
802 option forwardfor
803- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
804+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
805 http-request set-header Host site5.local
806 balance leastconn
807 server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200
808@@ -224,7 +224,7 @@ backend backend-cached-site5
809 backend backend-site5
810 retry-on all-retryable-errors
811 option redispatch 1
812- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
813+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
814 http-request set-header Host site5.local
815 balance leastconn
816 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
817@@ -232,14 +232,14 @@ backend backend-site5
818 backend backend-site5-2
819 retry-on all-retryable-errors
820 option redispatch 1
821- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
822+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
823 http-request set-header Host site5.local
824 balance leastconn
825 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
826
827 backend backend-cached-site6-local
828 option forwardfor
829- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
830+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
831 http-request set-header Host site6.local
832 balance leastconn
833 server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200
834@@ -247,14 +247,14 @@ backend backend-cached-site6-local
835 backend backend-site6-local
836 retry-on all-retryable-errors
837 option redispatch 1
838- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
839+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
840 http-request set-header Host site6.local
841 balance leastconn
842 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
843
844 backend backend-cached-site7-local
845 option forwardfor
846- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
847+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
848 http-request set-header Host site7.local
849 balance leastconn
850 server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200
851@@ -262,14 +262,14 @@ backend backend-cached-site7-local
852 backend backend-site7-local
853 retry-on all-retryable-errors
854 option redispatch 1
855- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
856+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
857 http-request set-header Host site7.local
858 balance leastconn
859 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
860
861 backend backend-cached-site8-local
862 option forwardfor
863- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
864+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
865 http-request set-header Host site8.local
866 balance leastconn
867 server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200
868@@ -277,7 +277,7 @@ backend backend-cached-site8-local
869 backend backend-site8-local
870 retry-on all-retryable-errors
871 option redispatch 1
872- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
873+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
874 http-request set-header Host site8.local
875 balance leastconn
876 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
877@@ -285,14 +285,14 @@ backend backend-site8-local
878 backend backend-site8-local-2
879 retry-on all-retryable-errors
880 option redispatch 1
881- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
882+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
883 http-request set-header Host auth.site8.local
884 balance leastconn
885 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
886
887 backend backend-cached-site9-local
888 option forwardfor
889- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
890+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
891 http-request set-header Host site9.local
892 balance leastconn
893 server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200
894@@ -300,7 +300,7 @@ backend backend-cached-site9-local
895 backend backend-site9-local
896 retry-on all-retryable-errors
897 option redispatch 1
898- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
899+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
900 http-request set-header Host site9.local
901 balance leastconn
902 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
903diff --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
904index 8a219b5..8d97a65 100644
905--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
906+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
907@@ -91,14 +91,14 @@ listen site1-local
908
909 backend backend-cached-site1-local
910 option forwardfor
911- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
912+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
913 http-request set-header Host site1.local
914 balance leastconn
915 server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400
916
917 backend backend-site1-local
918 option redispatch 1
919- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
920+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
921 http-request set-header Host site1.local
922 balance leastconn
923 server-template server_1_ 2 _http._tcp.us.archive.ubuntu.com:80 resolvers dns init-addr last,libc,none check inter 5s rise 2 fall 5 maxconn 200
924diff --git a/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt b/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt
925index 7108768..247c97d 100644
926--- a/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt
927+++ b/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt
928@@ -1,6 +1,6 @@
929
930 backend backend-site1-local
931- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
932+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
933 http-request set-header Host site1.local
934 balance leastconn
935 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
936@@ -8,7 +8,7 @@ backend backend-site1-local
937 server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200
938
939 backend backend-site2-local
940- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
941+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
942 http-request set-header Host site2.local
943 balance leastconn
944 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
945@@ -18,7 +18,7 @@ backend backend-site2-local
946 backend backend-site3-local
947 option forwardfor except 127.0.0.1
948 option forceclose
949- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
950+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
951 http-request set-header Host site3.local
952 balance leastconn
953 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
954@@ -26,43 +26,43 @@ backend backend-site3-local
955 server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200
956
957 backend backend-site5
958- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
959+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
960 http-request set-header Host site5.local
961 balance leastconn
962 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
963
964 backend backend-site5-2
965- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
966+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
967 http-request set-header Host site5.local
968 balance leastconn
969 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
970
971 backend backend-site6-local
972- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
973+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
974 http-request set-header Host site6.local
975 balance leastconn
976 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
977
978 backend backend-site7-local
979- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
980+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
981 http-request set-header Host site7.local
982 balance leastconn
983 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
984
985 backend backend-site8-local
986- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
987+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
988 http-request set-header Host site8.local
989 balance leastconn
990 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
991
992 backend backend-site8-local-2
993- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
994+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
995 http-request set-header Host auth.site8.local
996 balance leastconn
997 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
998
999 backend backend-site9-local
1000- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1001+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
1002 http-request set-header Host site9.local
1003 balance leastconn
1004 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
1005diff --git a/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt b/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt
1006index 8557bcc..e5812ab 100644
1007--- a/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt
1008+++ b/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt
1009@@ -1,6 +1,6 @@
1010
1011 backend backend-site1-local
1012- option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1013+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
1014 http-request set-header Host site1.local
1015 balance leastconn
1016 server server_1 archive.ubuntu.com:80 resolvers dns init-addr last,libc,none check inter 5s rise 2 fall 5 maxconn 200
1017diff --git a/tests/unit/files/haproxy_config_rendered_test_output.txt b/tests/unit/files/haproxy_config_rendered_test_output.txt
1018index dd6b279..290d918 100644
1019--- a/tests/unit/files/haproxy_config_rendered_test_output.txt
1020+++ b/tests/unit/files/haproxy_config_rendered_test_output.txt
1021@@ -106,7 +106,7 @@ listen combined-444
1022 use_backend backend-site8-local if { hdr(Host) -i site8.local }
1023
1024 backend backend-site1-local
1025- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1026+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
1027 http-request set-header Host site1.local
1028 balance leastconn
1029 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1030@@ -114,7 +114,7 @@ backend backend-site1-local
1031 server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200
1032
1033 backend backend-site2-local
1034- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1035+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
1036 http-request set-header Host site2.local
1037 balance leastconn
1038 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
1039@@ -124,7 +124,7 @@ backend backend-site2-local
1040 backend backend-site3-local
1041 option forwardfor except 127.0.0.1
1042 option forceclose
1043- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1044+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
1045 http-request set-header Host site3.local
1046 balance leastconn
1047 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1048@@ -132,43 +132,43 @@ backend backend-site3-local
1049 server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200
1050
1051 backend backend-site5
1052- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1053+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
1054 http-request set-header Host site5.local
1055 balance leastconn
1056 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1057
1058 backend backend-site5-2
1059- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1060+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
1061 http-request set-header Host site5.local
1062 balance leastconn
1063 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
1064
1065 backend backend-site6-local
1066- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1067+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
1068 http-request set-header Host site6.local
1069 balance leastconn
1070 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
1071
1072 backend backend-site7-local
1073- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1074+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
1075 http-request set-header Host site7.local
1076 balance leastconn
1077 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1078
1079 backend backend-site8-local
1080- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1081+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
1082 http-request set-header Host site8.local
1083 balance leastconn
1084 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1085
1086 backend backend-site8-local-2
1087- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1088+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
1089 http-request set-header Host auth.site8.local
1090 balance leastconn
1091 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
1092
1093 backend backend-site9-local
1094- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1095+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
1096 http-request set-header Host site9.local
1097 balance leastconn
1098 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200
1099diff --git a/tests/unit/files/haproxy_config_rendered_test_output2.txt b/tests/unit/files/haproxy_config_rendered_test_output2.txt
1100index 4620899..7489f26 100644
1101--- a/tests/unit/files/haproxy_config_rendered_test_output2.txt
1102+++ b/tests/unit/files/haproxy_config_rendered_test_output2.txt
1103@@ -106,7 +106,7 @@ listen combined-444
1104 use_backend backend-site8-local if { hdr(Host) -i site8.local }
1105
1106 backend backend-site1-local
1107- option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1108+ option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk
1109 http-request set-header Host site1.local
1110 balance leastconn
1111 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1112@@ -114,7 +114,7 @@ backend backend-site1-local
1113 server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200
1114
1115 backend backend-site2-local
1116- option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1117+ option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk
1118 http-request set-header Host site2.local
1119 balance leastconn
1120 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 1024 ssl sni str(site2.local) check-sni site2.local verify required ca-file ca-certificates.crt
1121@@ -124,7 +124,7 @@ backend backend-site2-local
1122 backend backend-site3-local
1123 option forwardfor except 127.0.0.1
1124 option forceclose
1125- option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1126+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk
1127 http-request set-header Host site3.local
1128 balance leastconn
1129 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1130@@ -132,43 +132,43 @@ backend backend-site3-local
1131 server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200
1132
1133 backend backend-site5
1134- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1135+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
1136 http-request set-header Host site5.local
1137 balance leastconn
1138 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1139
1140 backend backend-site5-2
1141- option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1142+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk
1143 http-request set-header Host site5.local
1144 balance leastconn
1145 server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200
1146
1147 backend backend-site6-local
1148- option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1149+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk
1150 http-request set-header Host site6.local
1151 balance leastconn
1152 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(site6.local) check-sni site6.local verify required ca-file ca-certificates.crt
1153
1154 backend backend-site7-local
1155- option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1156+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk
1157 http-request set-header Host site7.local
1158 balance leastconn
1159 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1160
1161 backend backend-site8-local
1162- option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1163+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk
1164 http-request set-header Host site8.local
1165 balance leastconn
1166 server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200
1167
1168 backend backend-site8-local-2
1169- option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1170+ option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk
1171 http-request set-header Host auth.site8.local
1172 balance leastconn
1173 server server_1 127.0.1.10:443 check inter 5s rise 2 fall 5 maxconn 200 ssl sni str(auth.site8.local) check-sni auth.site8.local verify required ca-file ca-certificates.crt
1174
1175 backend backend-site9-local
1176- option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
1177+ option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk
1178 http-request set-header Host site9.local
1179 balance leastconn
1180 server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200

Subscribers

People subscribed via source and target branches