Merge ~hloeung/content-cache-charm:cleanup into content-cache-charm:master
- Git
- lp:~hloeung/content-cache-charm
- cleanup
- Merge into master
Proposed by
Haw Loeung
Status: | Merged |
---|---|
Approved by: | Paul Collins |
Approved revision: | 0d24b8704846dfe0998266d139f87a8334bc868c |
Merged at revision: | e96904cf3b0cce2eb8052759eb105c681034ef73 |
Proposed branch: | ~hloeung/content-cache-charm:cleanup |
Merge into: | content-cache-charm:master |
Diff against target: |
1510 lines (+143/-418) 15 files modified
lib/haproxy.py (+7/-13) reactive/content_cache.py (+1/-0) tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+19/-57) tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+2/-6) tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+2/-6) tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt (+19/-57) tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt (+3/-9) tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt (+19/-57) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt (+19/-57) tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt (+19/-57) tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt (+2/-6) tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt (+10/-30) tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt (+1/-3) tests/unit/files/haproxy_config_rendered_test_output.txt (+10/-30) tests/unit/files/haproxy_config_rendered_test_output2.txt (+10/-30) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Collins | lgtm | Approve | |
Canonical IS Reviewers | Pending | ||
Review via email: mp+397708@code.launchpad.net |
Commit message
Revert "Use 'http-check send hdr' instead of adding headers at end of httpchk version"
Description of the change
To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Revision history for this message
Paul Collins (pjdc) : | # |
review:
Approve
(lgtm)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Change successfully merged at revision e96904cf3b0cce2
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/lib/haproxy.py b/lib/haproxy.py | |||
2 | index d9836a7..5153d97 100644 | |||
3 | --- a/lib/haproxy.py | |||
4 | +++ b/lib/haproxy.py | |||
5 | @@ -222,8 +222,8 @@ listen {name} | |||
6 | 222 | def render_stanza_backend(self, config): # NOQA: C901 | 222 | def render_stanza_backend(self, config): # NOQA: C901 |
7 | 223 | backend_stanza = """ | 223 | backend_stanza = """ |
8 | 224 | backend backend-{name} | 224 | backend backend-{name} |
9 | 225 | {indent}{httpchk} | ||
10 | 225 | {indent}http-request set-header Host {site_name} | 226 | {indent}http-request set-header Host {site_name} |
11 | 226 | {httpchk} | ||
12 | 227 | {options}{indent}balance {load_balancing_algorithm} | 227 | {options}{indent}balance {load_balancing_algorithm} |
13 | 228 | {backends} | 228 | {backends} |
14 | 229 | """ | 229 | """ |
15 | @@ -318,23 +318,17 @@ backend backend-{name} | |||
16 | 318 | if opts: | 318 | if opts: |
17 | 319 | options = '\n'.join(opts + ['']) | 319 | options = '\n'.join(opts + ['']) |
18 | 320 | 320 | ||
30 | 321 | httpchk = [] | 321 | httpchk = ( |
31 | 322 | # Add X-Cache-Request-IP for caching layer to log real client IP. | 322 | r"option httpchk {method} {path} HTTP/1.0\r\n" |
32 | 323 | if backend_name.startswith('cached-'): | 323 | r"Host:\ {site_name}\r\n" |
33 | 324 | httpchk.append('{indent}http-request set-header X-Cache-Request-IP %[src]'.format(indent=INDENT)) | 324 | r"User-Agent:\ haproxy/httpchk" |
34 | 325 | httpchk.append( | 325 | ).format(method=method, path=path, site_name=site_name) |
24 | 326 | '{indent}http-check send hdr Host {site_name}'.format(site_name=site_name, indent=INDENT) | ||
25 | 327 | ) | ||
26 | 328 | httpchk.append('{indent}http-check send hdr User-Agent haproxy/httpchk'.format(indent=INDENT)) | ||
27 | 329 | httpchk.append( | ||
28 | 330 | '{indent}option httpchk {method} {path} HTTP/1.0'.format(method=method, path=path, indent=INDENT) | ||
29 | 331 | ) | ||
35 | 332 | 326 | ||
36 | 333 | output = backend_stanza.format( | 327 | output = backend_stanza.format( |
37 | 334 | name=backend_name, | 328 | name=backend_name, |
38 | 335 | site=site, | 329 | site=site, |
39 | 336 | site_name=site_name, | 330 | site_name=site_name, |
41 | 337 | httpchk='\n'.join(httpchk), | 331 | httpchk=httpchk, |
42 | 338 | load_balancing_algorithm=self.load_balancing_algorithm, | 332 | load_balancing_algorithm=self.load_balancing_algorithm, |
43 | 339 | backends='\n'.join(backend_confs), | 333 | backends='\n'.join(backend_confs), |
44 | 340 | options=options, | 334 | options=options, |
45 | diff --git a/reactive/content_cache.py b/reactive/content_cache.py | |||
46 | index eeb24fe..9f95727 100644 | |||
47 | --- a/reactive/content_cache.py | |||
48 | +++ b/reactive/content_cache.py | |||
49 | @@ -281,6 +281,7 @@ def configure_haproxy(): # NOQA: C901 LP#1825084 | |||
50 | 281 | # Also, for caching layer, we want higher fall count as it's less | 281 | # Also, for caching layer, we want higher fall count as it's less |
51 | 282 | # likely the caching layer is down, 2 mins here (inter * fall). | 282 | # likely the caching layer is down, 2 mins here (inter * fall). |
52 | 283 | new_cached_loc_conf['backend-fall-count'] = 60 | 283 | new_cached_loc_conf['backend-fall-count'] = 60 |
53 | 284 | new_cached_loc_conf['backend-options'] = ['http-request set-header X-Cache-Request-IP %[src]'] | ||
54 | 284 | 285 | ||
55 | 285 | # No backends | 286 | # No backends |
56 | 286 | if not site_conf['locations'][location].get('backends'): | 287 | if not site_conf['locations'][location].get('backends'): |
57 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt | |||
58 | index 71b7714..658b0d1 100644 | |||
59 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt | |||
60 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt | |||
61 | @@ -155,19 +155,15 @@ listen site9-local | |||
62 | 155 | default_backend backend-site9-local | 155 | default_backend backend-site9-local |
63 | 156 | 156 | ||
64 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
65 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
66 | 158 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
67 | 159 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Cache-Request-IP %[src] |
68 | 160 | http-check send hdr Host site1.local | ||
69 | 161 | http-check send hdr User-Agent haproxy/httpchk | ||
70 | 162 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
71 | 163 | balance leastconn | 161 | balance leastconn |
72 | 164 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
73 | 165 | 163 | ||
74 | 166 | backend backend-site1-local | 164 | backend backend-site1-local |
75 | 165 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
76 | 167 | http-request set-header Host site1.local | 166 | http-request set-header Host site1.local |
77 | 168 | http-check send hdr Host site1.local | ||
78 | 169 | http-check send hdr User-Agent haproxy/httpchk | ||
79 | 170 | option httpchk HEAD / HTTP/1.0 | ||
80 | 171 | option redispatch 1 | 167 | option redispatch 1 |
81 | 172 | balance leastconn | 168 | balance leastconn |
82 | 173 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 169 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
83 | @@ -175,19 +171,15 @@ backend backend-site1-local | |||
84 | 175 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 171 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
85 | 176 | 172 | ||
86 | 177 | backend backend-cached-site2-local | 173 | backend backend-cached-site2-local |
87 | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
88 | 178 | http-request set-header Host site2.local | 175 | http-request set-header Host site2.local |
89 | 179 | http-request set-header X-Cache-Request-IP %[src] | 176 | http-request set-header X-Cache-Request-IP %[src] |
90 | 180 | http-check send hdr Host site2.local | ||
91 | 181 | http-check send hdr User-Agent haproxy/httpchk | ||
92 | 182 | option httpchk GET /check/ HTTP/1.0 | ||
93 | 183 | balance leastconn | 177 | balance leastconn |
94 | 184 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
95 | 185 | 179 | ||
96 | 186 | backend backend-site2-local | 180 | backend backend-site2-local |
97 | 181 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
98 | 187 | http-request set-header Host site2.local | 182 | http-request set-header Host site2.local |
99 | 188 | http-check send hdr Host site2.local | ||
100 | 189 | http-check send hdr User-Agent haproxy/httpchk | ||
101 | 190 | option httpchk GET /check/ HTTP/1.0 | ||
102 | 191 | option redispatch 1 | 183 | option redispatch 1 |
103 | 192 | balance leastconn | 184 | balance leastconn |
104 | 193 | 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 | 185 | 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 |
105 | @@ -195,19 +187,15 @@ backend backend-site2-local | |||
106 | 195 | server server_3 127.0.1.12: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 | 187 | server server_3 127.0.1.12: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 |
107 | 196 | 188 | ||
108 | 197 | backend backend-cached-site3-local | 189 | backend backend-cached-site3-local |
109 | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
110 | 198 | http-request set-header Host site3.local | 191 | http-request set-header Host site3.local |
111 | 199 | http-request set-header X-Cache-Request-IP %[src] | 192 | http-request set-header X-Cache-Request-IP %[src] |
112 | 200 | http-check send hdr Host site3.local | ||
113 | 201 | http-check send hdr User-Agent haproxy/httpchk | ||
114 | 202 | option httpchk HEAD / HTTP/1.0 | ||
115 | 203 | balance leastconn | 193 | balance leastconn |
116 | 204 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
117 | 205 | 195 | ||
118 | 206 | backend backend-site3-local | 196 | backend backend-site3-local |
119 | 197 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
120 | 207 | http-request set-header Host site3.local | 198 | http-request set-header Host site3.local |
121 | 208 | http-check send hdr Host site3.local | ||
122 | 209 | http-check send hdr User-Agent haproxy/httpchk | ||
123 | 210 | option httpchk HEAD / HTTP/1.0 | ||
124 | 211 | option forwardfor except 127.0.0.1 192.168.1.1 | 199 | option forwardfor except 127.0.0.1 192.168.1.1 |
125 | 212 | option forceclose | 200 | option forceclose |
126 | 213 | option redispatch 1 | 201 | option redispatch 1 |
127 | @@ -217,118 +205,92 @@ backend backend-site3-local | |||
128 | 217 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 205 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
129 | 218 | 206 | ||
130 | 219 | backend backend-cached-site4-local | 207 | backend backend-cached-site4-local |
131 | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | ||
132 | 220 | http-request set-header Host site4.local | 209 | http-request set-header Host site4.local |
133 | 221 | http-request set-header X-Cache-Request-IP %[src] | 210 | http-request set-header X-Cache-Request-IP %[src] |
134 | 222 | http-check send hdr Host site4.local | ||
135 | 223 | http-check send hdr User-Agent haproxy/httpchk | ||
136 | 224 | option httpchk HEAD / HTTP/1.0 | ||
137 | 225 | balance leastconn | 211 | balance leastconn |
138 | 226 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
139 | 227 | 213 | ||
140 | 228 | backend backend-cached-site5 | 214 | backend backend-cached-site5 |
141 | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
142 | 229 | http-request set-header Host site5.local | 216 | http-request set-header Host site5.local |
143 | 230 | http-request set-header X-Cache-Request-IP %[src] | 217 | http-request set-header X-Cache-Request-IP %[src] |
144 | 231 | http-check send hdr Host site5.local | ||
145 | 232 | http-check send hdr User-Agent haproxy/httpchk | ||
146 | 233 | option httpchk HEAD / HTTP/1.0 | ||
147 | 234 | balance leastconn | 218 | balance leastconn |
148 | 235 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
149 | 236 | 220 | ||
150 | 237 | backend backend-site5 | 221 | backend backend-site5 |
151 | 222 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
152 | 238 | http-request set-header Host site5.local | 223 | http-request set-header Host site5.local |
153 | 239 | http-check send hdr Host site5.local | ||
154 | 240 | http-check send hdr User-Agent haproxy/httpchk | ||
155 | 241 | option httpchk HEAD / HTTP/1.0 | ||
156 | 242 | option redispatch 1 | 224 | option redispatch 1 |
157 | 243 | balance leastconn | 225 | balance leastconn |
158 | 244 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 226 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
159 | 245 | 227 | ||
160 | 246 | backend backend-site5-2 | 228 | backend backend-site5-2 |
161 | 229 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
162 | 247 | http-request set-header Host site5.local | 230 | http-request set-header Host site5.local |
163 | 248 | http-check send hdr Host site5.local | ||
164 | 249 | http-check send hdr User-Agent haproxy/httpchk | ||
165 | 250 | option httpchk HEAD / HTTP/1.0 | ||
166 | 251 | option redispatch 1 | 231 | option redispatch 1 |
167 | 252 | balance leastconn | 232 | balance leastconn |
168 | 253 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 233 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
169 | 254 | 234 | ||
170 | 255 | backend backend-cached-site6-local | 235 | backend backend-cached-site6-local |
171 | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
172 | 256 | http-request set-header Host site6.local | 237 | http-request set-header Host site6.local |
173 | 257 | http-request set-header X-Cache-Request-IP %[src] | 238 | http-request set-header X-Cache-Request-IP %[src] |
174 | 258 | http-check send hdr Host site6.local | ||
175 | 259 | http-check send hdr User-Agent haproxy/httpchk | ||
176 | 260 | option httpchk HEAD / HTTP/1.0 | ||
177 | 261 | balance leastconn | 239 | balance leastconn |
178 | 262 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
179 | 263 | 241 | ||
180 | 264 | backend backend-site6-local | 242 | backend backend-site6-local |
181 | 243 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
182 | 265 | http-request set-header Host site6.local | 244 | http-request set-header Host site6.local |
183 | 266 | http-check send hdr Host site6.local | ||
184 | 267 | http-check send hdr User-Agent haproxy/httpchk | ||
185 | 268 | option httpchk HEAD / HTTP/1.0 | ||
186 | 269 | option redispatch 1 | 245 | option redispatch 1 |
187 | 270 | balance leastconn | 246 | balance leastconn |
188 | 271 | 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 | 247 | 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 |
189 | 272 | 248 | ||
190 | 273 | backend backend-cached-site7-local | 249 | backend backend-cached-site7-local |
191 | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
192 | 274 | http-request set-header Host site7.local | 251 | http-request set-header Host site7.local |
193 | 275 | http-request set-header X-Cache-Request-IP %[src] | 252 | http-request set-header X-Cache-Request-IP %[src] |
194 | 276 | http-check send hdr Host site7.local | ||
195 | 277 | http-check send hdr User-Agent haproxy/httpchk | ||
196 | 278 | option httpchk HEAD / HTTP/1.0 | ||
197 | 279 | balance leastconn | 253 | balance leastconn |
198 | 280 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
199 | 281 | 255 | ||
200 | 282 | backend backend-site7-local | 256 | backend backend-site7-local |
201 | 257 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
202 | 283 | http-request set-header Host site7.local | 258 | http-request set-header Host site7.local |
203 | 284 | http-check send hdr Host site7.local | ||
204 | 285 | http-check send hdr User-Agent haproxy/httpchk | ||
205 | 286 | option httpchk HEAD / HTTP/1.0 | ||
206 | 287 | option redispatch 1 | 259 | option redispatch 1 |
207 | 288 | balance leastconn | 260 | balance leastconn |
208 | 289 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 261 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
209 | 290 | 262 | ||
210 | 291 | backend backend-cached-site8-local | 263 | backend backend-cached-site8-local |
211 | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
212 | 292 | http-request set-header Host site8.local | 265 | http-request set-header Host site8.local |
213 | 293 | http-request set-header X-Cache-Request-IP %[src] | 266 | http-request set-header X-Cache-Request-IP %[src] |
214 | 294 | http-check send hdr Host site8.local | ||
215 | 295 | http-check send hdr User-Agent haproxy/httpchk | ||
216 | 296 | option httpchk HEAD / HTTP/1.0 | ||
217 | 297 | balance leastconn | 267 | balance leastconn |
218 | 298 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
219 | 299 | 269 | ||
220 | 300 | backend backend-site8-local | 270 | backend backend-site8-local |
221 | 271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
222 | 301 | http-request set-header Host site8.local | 272 | http-request set-header Host site8.local |
223 | 302 | http-check send hdr Host site8.local | ||
224 | 303 | http-check send hdr User-Agent haproxy/httpchk | ||
225 | 304 | option httpchk HEAD / HTTP/1.0 | ||
226 | 305 | option redispatch 1 | 273 | option redispatch 1 |
227 | 306 | balance leastconn | 274 | balance leastconn |
228 | 307 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 275 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
229 | 308 | 276 | ||
230 | 309 | backend backend-site8-local-2 | 277 | backend backend-site8-local-2 |
231 | 278 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
232 | 310 | http-request set-header Host auth.site8.local | 279 | http-request set-header Host auth.site8.local |
233 | 311 | http-check send hdr Host auth.site8.local | ||
234 | 312 | http-check send hdr User-Agent haproxy/httpchk | ||
235 | 313 | option httpchk HEAD / HTTP/1.0 | ||
236 | 314 | option redispatch 1 | 280 | option redispatch 1 |
237 | 315 | balance leastconn | 281 | balance leastconn |
238 | 316 | 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 | 282 | 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 |
239 | 317 | 283 | ||
240 | 318 | backend backend-cached-site9-local | 284 | backend backend-cached-site9-local |
241 | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
242 | 319 | http-request set-header Host site9.local | 286 | http-request set-header Host site9.local |
243 | 320 | http-request set-header X-Cache-Request-IP %[src] | 287 | http-request set-header X-Cache-Request-IP %[src] |
244 | 321 | http-check send hdr Host site9.local | ||
245 | 322 | http-check send hdr User-Agent haproxy/httpchk | ||
246 | 323 | option httpchk HEAD / HTTP/1.0 | ||
247 | 324 | balance leastconn | 288 | balance leastconn |
248 | 325 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
249 | 326 | 290 | ||
250 | 327 | backend backend-site9-local | 291 | backend backend-site9-local |
251 | 292 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
252 | 328 | http-request set-header Host site9.local | 293 | http-request set-header Host site9.local |
253 | 329 | http-check send hdr Host site9.local | ||
254 | 330 | http-check send hdr User-Agent haproxy/httpchk | ||
255 | 331 | option httpchk HEAD / HTTP/1.0 | ||
256 | 332 | option redispatch 1 | 294 | option redispatch 1 |
257 | 333 | balance leastconn | 295 | balance leastconn |
258 | 334 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 296 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
259 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt | |||
260 | index 846b16d..7931e5e 100644 | |||
261 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt | |||
262 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt | |||
263 | @@ -90,19 +90,15 @@ listen site1-local | |||
264 | 90 | default_backend backend-site1-local | 90 | default_backend backend-site1-local |
265 | 91 | 91 | ||
266 | 92 | backend backend-cached-site1-local | 92 | backend backend-cached-site1-local |
267 | 93 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
268 | 93 | http-request set-header Host site1.local | 94 | http-request set-header Host site1.local |
269 | 94 | http-request set-header X-Cache-Request-IP %[src] | 95 | http-request set-header X-Cache-Request-IP %[src] |
270 | 95 | http-check send hdr Host site1.local | ||
271 | 96 | http-check send hdr User-Agent haproxy/httpchk | ||
272 | 97 | option httpchk HEAD / HTTP/1.0 | ||
273 | 98 | balance leastconn | 96 | balance leastconn |
274 | 99 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 | 97 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 |
275 | 100 | 98 | ||
276 | 101 | backend backend-site1-local | 99 | backend backend-site1-local |
277 | 100 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
278 | 102 | http-request set-header Host site1.local | 101 | http-request set-header Host site1.local |
279 | 103 | http-check send hdr Host site1.local | ||
280 | 104 | http-check send hdr User-Agent haproxy/httpchk | ||
281 | 105 | option httpchk HEAD / HTTP/1.0 | ||
282 | 106 | retries 3 | 102 | retries 3 |
283 | 107 | option redispatch 1 | 103 | option redispatch 1 |
284 | 108 | balance leastconn | 104 | balance leastconn |
285 | diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt | |||
286 | index 37a6665..e8536e0 100644 | |||
287 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt | |||
288 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt | |||
289 | @@ -96,19 +96,15 @@ listen site1-local | |||
290 | 96 | default_backend backend-site1-local | 96 | default_backend backend-site1-local |
291 | 97 | 97 | ||
292 | 98 | backend backend-cached-site1-local | 98 | backend backend-cached-site1-local |
293 | 99 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
294 | 99 | http-request set-header Host site1.local | 100 | http-request set-header Host site1.local |
295 | 100 | http-request set-header X-Cache-Request-IP %[src] | 101 | http-request set-header X-Cache-Request-IP %[src] |
296 | 101 | http-check send hdr Host site1.local | ||
297 | 102 | http-check send hdr User-Agent haproxy/httpchk | ||
298 | 103 | option httpchk HEAD / HTTP/1.0 | ||
299 | 104 | balance leastconn | 102 | balance leastconn |
300 | 105 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 | 103 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 200 |
301 | 106 | 104 | ||
302 | 107 | backend backend-site1-local | 105 | backend backend-site1-local |
303 | 106 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
304 | 108 | http-request set-header Host site1.local | 107 | http-request set-header Host site1.local |
305 | 109 | http-check send hdr Host site1.local | ||
306 | 110 | http-check send hdr User-Agent haproxy/httpchk | ||
307 | 111 | option httpchk HEAD / HTTP/1.0 | ||
308 | 112 | option redispatch 1 | 108 | option redispatch 1 |
309 | 113 | balance leastconn | 109 | balance leastconn |
310 | 114 | server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200 | 110 | server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200 |
311 | 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 | |||
312 | index 5ae5568..47c5663 100644 | |||
313 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt | |||
314 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt | |||
315 | @@ -155,19 +155,15 @@ listen site9-local | |||
316 | 155 | default_backend backend-site9-local | 155 | default_backend backend-site9-local |
317 | 156 | 156 | ||
318 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
319 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
320 | 158 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
321 | 159 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Cache-Request-IP %[src] |
322 | 160 | http-check send hdr Host site1.local | ||
323 | 161 | http-check send hdr User-Agent haproxy/httpchk | ||
324 | 162 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
325 | 163 | balance leastconn | 161 | balance leastconn |
326 | 164 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
327 | 165 | 163 | ||
328 | 166 | backend backend-site1-local | 164 | backend backend-site1-local |
329 | 165 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
330 | 167 | http-request set-header Host site1.local | 166 | http-request set-header Host site1.local |
331 | 168 | http-check send hdr Host site1.local | ||
332 | 169 | http-check send hdr User-Agent haproxy/httpchk | ||
333 | 170 | option httpchk HEAD / HTTP/1.0 | ||
334 | 171 | option redispatch 1 | 167 | option redispatch 1 |
335 | 172 | balance leastconn | 168 | balance leastconn |
336 | 173 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 169 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
337 | @@ -175,19 +171,15 @@ backend backend-site1-local | |||
338 | 175 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 171 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
339 | 176 | 172 | ||
340 | 177 | backend backend-cached-site2-local | 173 | backend backend-cached-site2-local |
341 | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
342 | 178 | http-request set-header Host site2.local | 175 | http-request set-header Host site2.local |
343 | 179 | http-request set-header X-Cache-Request-IP %[src] | 176 | http-request set-header X-Cache-Request-IP %[src] |
344 | 180 | http-check send hdr Host site2.local | ||
345 | 181 | http-check send hdr User-Agent haproxy/httpchk | ||
346 | 182 | option httpchk GET /check/ HTTP/1.0 | ||
347 | 183 | balance leastconn | 177 | balance leastconn |
348 | 184 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
349 | 185 | 179 | ||
350 | 186 | backend backend-site2-local | 180 | backend backend-site2-local |
351 | 181 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
352 | 187 | http-request set-header Host site2.local | 182 | http-request set-header Host site2.local |
353 | 188 | http-check send hdr Host site2.local | ||
354 | 189 | http-check send hdr User-Agent haproxy/httpchk | ||
355 | 190 | option httpchk GET /check/ HTTP/1.0 | ||
356 | 191 | option redispatch 1 | 183 | option redispatch 1 |
357 | 192 | balance leastconn | 184 | balance leastconn |
358 | 193 | 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 | 185 | 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 |
359 | @@ -195,19 +187,15 @@ backend backend-site2-local | |||
360 | 195 | server server_3 127.0.1.12: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 | 187 | server server_3 127.0.1.12: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 |
361 | 196 | 188 | ||
362 | 197 | backend backend-cached-site3-local | 189 | backend backend-cached-site3-local |
363 | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
364 | 198 | http-request set-header Host site3.local | 191 | http-request set-header Host site3.local |
365 | 199 | http-request set-header X-Cache-Request-IP %[src] | 192 | http-request set-header X-Cache-Request-IP %[src] |
366 | 200 | http-check send hdr Host site3.local | ||
367 | 201 | http-check send hdr User-Agent haproxy/httpchk | ||
368 | 202 | option httpchk HEAD / HTTP/1.0 | ||
369 | 203 | balance leastconn | 193 | balance leastconn |
370 | 204 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
371 | 205 | 195 | ||
372 | 206 | backend backend-site3-local | 196 | backend backend-site3-local |
373 | 197 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
374 | 207 | http-request set-header Host site3.local | 198 | http-request set-header Host site3.local |
375 | 208 | http-check send hdr Host site3.local | ||
376 | 209 | http-check send hdr User-Agent haproxy/httpchk | ||
377 | 210 | option httpchk HEAD / HTTP/1.0 | ||
378 | 211 | option forwardfor except 127.0.0.1 192.168.1.1 | 199 | option forwardfor except 127.0.0.1 192.168.1.1 |
379 | 212 | option forceclose | 200 | option forceclose |
380 | 213 | option redispatch 1 | 201 | option redispatch 1 |
381 | @@ -217,118 +205,92 @@ backend backend-site3-local | |||
382 | 217 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 205 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
383 | 218 | 206 | ||
384 | 219 | backend backend-cached-site4-local | 207 | backend backend-cached-site4-local |
385 | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | ||
386 | 220 | http-request set-header Host site4.local | 209 | http-request set-header Host site4.local |
387 | 221 | http-request set-header X-Cache-Request-IP %[src] | 210 | http-request set-header X-Cache-Request-IP %[src] |
388 | 222 | http-check send hdr Host site4.local | ||
389 | 223 | http-check send hdr User-Agent haproxy/httpchk | ||
390 | 224 | option httpchk HEAD / HTTP/1.0 | ||
391 | 225 | balance leastconn | 211 | balance leastconn |
392 | 226 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
393 | 227 | 213 | ||
394 | 228 | backend backend-cached-site5 | 214 | backend backend-cached-site5 |
395 | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
396 | 229 | http-request set-header Host site5.local | 216 | http-request set-header Host site5.local |
397 | 230 | http-request set-header X-Cache-Request-IP %[src] | 217 | http-request set-header X-Cache-Request-IP %[src] |
398 | 231 | http-check send hdr Host site5.local | ||
399 | 232 | http-check send hdr User-Agent haproxy/httpchk | ||
400 | 233 | option httpchk HEAD / HTTP/1.0 | ||
401 | 234 | balance leastconn | 218 | balance leastconn |
402 | 235 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
403 | 236 | 220 | ||
404 | 237 | backend backend-site5 | 221 | backend backend-site5 |
405 | 222 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
406 | 238 | http-request set-header Host site5.local | 223 | http-request set-header Host site5.local |
407 | 239 | http-check send hdr Host site5.local | ||
408 | 240 | http-check send hdr User-Agent haproxy/httpchk | ||
409 | 241 | option httpchk HEAD / HTTP/1.0 | ||
410 | 242 | option redispatch 1 | 224 | option redispatch 1 |
411 | 243 | balance leastconn | 225 | balance leastconn |
412 | 244 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 226 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
413 | 245 | 227 | ||
414 | 246 | backend backend-site5-2 | 228 | backend backend-site5-2 |
415 | 229 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
416 | 247 | http-request set-header Host site5.local | 230 | http-request set-header Host site5.local |
417 | 248 | http-check send hdr Host site5.local | ||
418 | 249 | http-check send hdr User-Agent haproxy/httpchk | ||
419 | 250 | option httpchk HEAD / HTTP/1.0 | ||
420 | 251 | option redispatch 1 | 231 | option redispatch 1 |
421 | 252 | balance leastconn | 232 | balance leastconn |
422 | 253 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 233 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
423 | 254 | 234 | ||
424 | 255 | backend backend-cached-site6-local | 235 | backend backend-cached-site6-local |
425 | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
426 | 256 | http-request set-header Host site6.local | 237 | http-request set-header Host site6.local |
427 | 257 | http-request set-header X-Cache-Request-IP %[src] | 238 | http-request set-header X-Cache-Request-IP %[src] |
428 | 258 | http-check send hdr Host site6.local | ||
429 | 259 | http-check send hdr User-Agent haproxy/httpchk | ||
430 | 260 | option httpchk HEAD / HTTP/1.0 | ||
431 | 261 | balance leastconn | 239 | balance leastconn |
432 | 262 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
433 | 263 | 241 | ||
434 | 264 | backend backend-site6-local | 242 | backend backend-site6-local |
435 | 243 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
436 | 265 | http-request set-header Host site6.local | 244 | http-request set-header Host site6.local |
437 | 266 | http-check send hdr Host site6.local | ||
438 | 267 | http-check send hdr User-Agent haproxy/httpchk | ||
439 | 268 | option httpchk HEAD / HTTP/1.0 | ||
440 | 269 | option redispatch 1 | 245 | option redispatch 1 |
441 | 270 | balance leastconn | 246 | balance leastconn |
442 | 271 | 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 | 247 | 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 |
443 | 272 | 248 | ||
444 | 273 | backend backend-cached-site7-local | 249 | backend backend-cached-site7-local |
445 | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
446 | 274 | http-request set-header Host site7.local | 251 | http-request set-header Host site7.local |
447 | 275 | http-request set-header X-Cache-Request-IP %[src] | 252 | http-request set-header X-Cache-Request-IP %[src] |
448 | 276 | http-check send hdr Host site7.local | ||
449 | 277 | http-check send hdr User-Agent haproxy/httpchk | ||
450 | 278 | option httpchk HEAD / HTTP/1.0 | ||
451 | 279 | balance leastconn | 253 | balance leastconn |
452 | 280 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
453 | 281 | 255 | ||
454 | 282 | backend backend-site7-local | 256 | backend backend-site7-local |
455 | 257 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
456 | 283 | http-request set-header Host site7.local | 258 | http-request set-header Host site7.local |
457 | 284 | http-check send hdr Host site7.local | ||
458 | 285 | http-check send hdr User-Agent haproxy/httpchk | ||
459 | 286 | option httpchk HEAD / HTTP/1.0 | ||
460 | 287 | option redispatch 1 | 259 | option redispatch 1 |
461 | 288 | balance leastconn | 260 | balance leastconn |
462 | 289 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 261 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
463 | 290 | 262 | ||
464 | 291 | backend backend-cached-site8-local | 263 | backend backend-cached-site8-local |
465 | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
466 | 292 | http-request set-header Host site8.local | 265 | http-request set-header Host site8.local |
467 | 293 | http-request set-header X-Cache-Request-IP %[src] | 266 | http-request set-header X-Cache-Request-IP %[src] |
468 | 294 | http-check send hdr Host site8.local | ||
469 | 295 | http-check send hdr User-Agent haproxy/httpchk | ||
470 | 296 | option httpchk HEAD / HTTP/1.0 | ||
471 | 297 | balance leastconn | 267 | balance leastconn |
472 | 298 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
473 | 299 | 269 | ||
474 | 300 | backend backend-site8-local | 270 | backend backend-site8-local |
475 | 271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
476 | 301 | http-request set-header Host site8.local | 272 | http-request set-header Host site8.local |
477 | 302 | http-check send hdr Host site8.local | ||
478 | 303 | http-check send hdr User-Agent haproxy/httpchk | ||
479 | 304 | option httpchk HEAD / HTTP/1.0 | ||
480 | 305 | option redispatch 1 | 273 | option redispatch 1 |
481 | 306 | balance leastconn | 274 | balance leastconn |
482 | 307 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 275 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
483 | 308 | 276 | ||
484 | 309 | backend backend-site8-local-2 | 277 | backend backend-site8-local-2 |
485 | 278 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
486 | 310 | http-request set-header Host auth.site8.local | 279 | http-request set-header Host auth.site8.local |
487 | 311 | http-check send hdr Host auth.site8.local | ||
488 | 312 | http-check send hdr User-Agent haproxy/httpchk | ||
489 | 313 | option httpchk HEAD / HTTP/1.0 | ||
490 | 314 | option redispatch 1 | 280 | option redispatch 1 |
491 | 315 | balance leastconn | 281 | balance leastconn |
492 | 316 | 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 | 282 | 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 |
493 | 317 | 283 | ||
494 | 318 | backend backend-cached-site9-local | 284 | backend backend-cached-site9-local |
495 | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
496 | 319 | http-request set-header Host site9.local | 286 | http-request set-header Host site9.local |
497 | 320 | http-request set-header X-Cache-Request-IP %[src] | 287 | http-request set-header X-Cache-Request-IP %[src] |
498 | 321 | http-check send hdr Host site9.local | ||
499 | 322 | http-check send hdr User-Agent haproxy/httpchk | ||
500 | 323 | option httpchk HEAD / HTTP/1.0 | ||
501 | 324 | balance leastconn | 288 | balance leastconn |
502 | 325 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
503 | 326 | 290 | ||
504 | 327 | backend backend-site9-local | 291 | backend backend-site9-local |
505 | 292 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
506 | 328 | http-request set-header Host site9.local | 293 | http-request set-header Host site9.local |
507 | 329 | http-check send hdr Host site9.local | ||
508 | 330 | http-check send hdr User-Agent haproxy/httpchk | ||
509 | 331 | option httpchk HEAD / HTTP/1.0 | ||
510 | 332 | option redispatch 1 | 294 | option redispatch 1 |
511 | 333 | balance leastconn | 295 | balance leastconn |
512 | 334 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 296 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
513 | 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 | |||
514 | index 1248506..b110384 100644 | |||
515 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt | |||
516 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt | |||
517 | @@ -95,19 +95,15 @@ listen site1-local-2 | |||
518 | 95 | default_backend backend-site1-local-2 | 95 | default_backend backend-site1-local-2 |
519 | 96 | 96 | ||
520 | 97 | backend backend-cached-site1-local | 97 | backend backend-cached-site1-local |
521 | 98 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
522 | 98 | http-request set-header Host site1.local | 99 | http-request set-header Host site1.local |
523 | 99 | http-request set-header X-Cache-Request-IP %[src] | 100 | http-request set-header X-Cache-Request-IP %[src] |
524 | 100 | http-check send hdr Host site1.local | ||
525 | 101 | http-check send hdr User-Agent haproxy/httpchk | ||
526 | 102 | option httpchk HEAD / HTTP/1.0 | ||
527 | 103 | balance leastconn | 101 | balance leastconn |
528 | 104 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 | 102 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 |
529 | 105 | 103 | ||
530 | 106 | backend backend-site1-local | 104 | backend backend-site1-local |
531 | 105 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
532 | 107 | http-request set-header Host site1.local | 106 | http-request set-header Host site1.local |
533 | 108 | http-check send hdr Host site1.local | ||
534 | 109 | http-check send hdr User-Agent haproxy/httpchk | ||
535 | 110 | option httpchk HEAD / HTTP/1.0 | ||
536 | 111 | option allbackups | 107 | option allbackups |
537 | 112 | option redispatch 1 | 108 | option redispatch 1 |
538 | 113 | balance leastconn | 109 | balance leastconn |
539 | @@ -115,10 +111,8 @@ backend backend-site1-local | |||
540 | 115 | server server_2 192.168.1.2:8080 backup check inter 5s rise 2 fall 5 maxconn 200 | 111 | server server_2 192.168.1.2:8080 backup check inter 5s rise 2 fall 5 maxconn 200 |
541 | 116 | 112 | ||
542 | 117 | backend backend-site1-local-2 | 113 | backend backend-site1-local-2 |
543 | 114 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
544 | 118 | http-request set-header Host site1.local | 115 | http-request set-header Host site1.local |
545 | 119 | http-check send hdr Host site1.local | ||
546 | 120 | http-check send hdr User-Agent haproxy/httpchk | ||
547 | 121 | option httpchk HEAD / HTTP/1.0 | ||
548 | 122 | option redispatch 1 | 116 | option redispatch 1 |
549 | 123 | balance leastconn | 117 | balance leastconn |
550 | 124 | server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200 | 118 | server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 200 |
551 | 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 | |||
552 | index 6a2c85a..8ad76cb 100644 | |||
553 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt | |||
554 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt | |||
555 | @@ -155,19 +155,15 @@ listen site9-local | |||
556 | 155 | default_backend backend-site9-local | 155 | default_backend backend-site9-local |
557 | 156 | 156 | ||
558 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
559 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
560 | 158 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
561 | 159 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Cache-Request-IP %[src] |
562 | 160 | http-check send hdr Host site1.local | ||
563 | 161 | http-check send hdr User-Agent haproxy/httpchk | ||
564 | 162 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
565 | 163 | balance roundrobin | 161 | balance roundrobin |
566 | 164 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
567 | 165 | 163 | ||
568 | 166 | backend backend-site1-local | 164 | backend backend-site1-local |
569 | 165 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
570 | 167 | http-request set-header Host site1.local | 166 | http-request set-header Host site1.local |
571 | 168 | http-check send hdr Host site1.local | ||
572 | 169 | http-check send hdr User-Agent haproxy/httpchk | ||
573 | 170 | option httpchk HEAD / HTTP/1.0 | ||
574 | 171 | option redispatch 1 | 167 | option redispatch 1 |
575 | 172 | balance roundrobin | 168 | balance roundrobin |
576 | 173 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 169 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
577 | @@ -175,19 +171,15 @@ backend backend-site1-local | |||
578 | 175 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 171 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
579 | 176 | 172 | ||
580 | 177 | backend backend-cached-site2-local | 173 | backend backend-cached-site2-local |
581 | 174 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
582 | 178 | http-request set-header Host site2.local | 175 | http-request set-header Host site2.local |
583 | 179 | http-request set-header X-Cache-Request-IP %[src] | 176 | http-request set-header X-Cache-Request-IP %[src] |
584 | 180 | http-check send hdr Host site2.local | ||
585 | 181 | http-check send hdr User-Agent haproxy/httpchk | ||
586 | 182 | option httpchk GET /check/ HTTP/1.0 | ||
587 | 183 | balance roundrobin | 177 | balance roundrobin |
588 | 184 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 178 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
589 | 185 | 179 | ||
590 | 186 | backend backend-site2-local | 180 | backend backend-site2-local |
591 | 181 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
592 | 187 | http-request set-header Host site2.local | 182 | http-request set-header Host site2.local |
593 | 188 | http-check send hdr Host site2.local | ||
594 | 189 | http-check send hdr User-Agent haproxy/httpchk | ||
595 | 190 | option httpchk GET /check/ HTTP/1.0 | ||
596 | 191 | option redispatch 1 | 183 | option redispatch 1 |
597 | 192 | balance roundrobin | 184 | balance roundrobin |
598 | 193 | 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 | 185 | 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 |
599 | @@ -195,19 +187,15 @@ backend backend-site2-local | |||
600 | 195 | server server_3 127.0.1.12: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 | 187 | server server_3 127.0.1.12: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 |
601 | 196 | 188 | ||
602 | 197 | backend backend-cached-site3-local | 189 | backend backend-cached-site3-local |
603 | 190 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
604 | 198 | http-request set-header Host site3.local | 191 | http-request set-header Host site3.local |
605 | 199 | http-request set-header X-Cache-Request-IP %[src] | 192 | http-request set-header X-Cache-Request-IP %[src] |
606 | 200 | http-check send hdr Host site3.local | ||
607 | 201 | http-check send hdr User-Agent haproxy/httpchk | ||
608 | 202 | option httpchk HEAD / HTTP/1.0 | ||
609 | 203 | balance roundrobin | 193 | balance roundrobin |
610 | 204 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 194 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
611 | 205 | 195 | ||
612 | 206 | backend backend-site3-local | 196 | backend backend-site3-local |
613 | 197 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
614 | 207 | http-request set-header Host site3.local | 198 | http-request set-header Host site3.local |
615 | 208 | http-check send hdr Host site3.local | ||
616 | 209 | http-check send hdr User-Agent haproxy/httpchk | ||
617 | 210 | option httpchk HEAD / HTTP/1.0 | ||
618 | 211 | option forwardfor except 127.0.0.1 192.168.1.1 | 199 | option forwardfor except 127.0.0.1 192.168.1.1 |
619 | 212 | option forceclose | 200 | option forceclose |
620 | 213 | option redispatch 1 | 201 | option redispatch 1 |
621 | @@ -217,118 +205,92 @@ backend backend-site3-local | |||
622 | 217 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 205 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
623 | 218 | 206 | ||
624 | 219 | backend backend-cached-site4-local | 207 | backend backend-cached-site4-local |
625 | 208 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | ||
626 | 220 | http-request set-header Host site4.local | 209 | http-request set-header Host site4.local |
627 | 221 | http-request set-header X-Cache-Request-IP %[src] | 210 | http-request set-header X-Cache-Request-IP %[src] |
628 | 222 | http-check send hdr Host site4.local | ||
629 | 223 | http-check send hdr User-Agent haproxy/httpchk | ||
630 | 224 | option httpchk HEAD / HTTP/1.0 | ||
631 | 225 | balance roundrobin | 211 | balance roundrobin |
632 | 226 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 212 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
633 | 227 | 213 | ||
634 | 228 | backend backend-cached-site5 | 214 | backend backend-cached-site5 |
635 | 215 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
636 | 229 | http-request set-header Host site5.local | 216 | http-request set-header Host site5.local |
637 | 230 | http-request set-header X-Cache-Request-IP %[src] | 217 | http-request set-header X-Cache-Request-IP %[src] |
638 | 231 | http-check send hdr Host site5.local | ||
639 | 232 | http-check send hdr User-Agent haproxy/httpchk | ||
640 | 233 | option httpchk HEAD / HTTP/1.0 | ||
641 | 234 | balance roundrobin | 218 | balance roundrobin |
642 | 235 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 219 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
643 | 236 | 220 | ||
644 | 237 | backend backend-site5 | 221 | backend backend-site5 |
645 | 222 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
646 | 238 | http-request set-header Host site5.local | 223 | http-request set-header Host site5.local |
647 | 239 | http-check send hdr Host site5.local | ||
648 | 240 | http-check send hdr User-Agent haproxy/httpchk | ||
649 | 241 | option httpchk HEAD / HTTP/1.0 | ||
650 | 242 | option redispatch 1 | 224 | option redispatch 1 |
651 | 243 | balance roundrobin | 225 | balance roundrobin |
652 | 244 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 226 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
653 | 245 | 227 | ||
654 | 246 | backend backend-site5-2 | 228 | backend backend-site5-2 |
655 | 229 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
656 | 247 | http-request set-header Host site5.local | 230 | http-request set-header Host site5.local |
657 | 248 | http-check send hdr Host site5.local | ||
658 | 249 | http-check send hdr User-Agent haproxy/httpchk | ||
659 | 250 | option httpchk HEAD / HTTP/1.0 | ||
660 | 251 | option redispatch 1 | 231 | option redispatch 1 |
661 | 252 | balance roundrobin | 232 | balance roundrobin |
662 | 253 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 233 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
663 | 254 | 234 | ||
664 | 255 | backend backend-cached-site6-local | 235 | backend backend-cached-site6-local |
665 | 236 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
666 | 256 | http-request set-header Host site6.local | 237 | http-request set-header Host site6.local |
667 | 257 | http-request set-header X-Cache-Request-IP %[src] | 238 | http-request set-header X-Cache-Request-IP %[src] |
668 | 258 | http-check send hdr Host site6.local | ||
669 | 259 | http-check send hdr User-Agent haproxy/httpchk | ||
670 | 260 | option httpchk HEAD / HTTP/1.0 | ||
671 | 261 | balance roundrobin | 239 | balance roundrobin |
672 | 262 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 240 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
673 | 263 | 241 | ||
674 | 264 | backend backend-site6-local | 242 | backend backend-site6-local |
675 | 243 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
676 | 265 | http-request set-header Host site6.local | 244 | http-request set-header Host site6.local |
677 | 266 | http-check send hdr Host site6.local | ||
678 | 267 | http-check send hdr User-Agent haproxy/httpchk | ||
679 | 268 | option httpchk HEAD / HTTP/1.0 | ||
680 | 269 | option redispatch 1 | 245 | option redispatch 1 |
681 | 270 | balance roundrobin | 246 | balance roundrobin |
682 | 271 | 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 | 247 | 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 |
683 | 272 | 248 | ||
684 | 273 | backend backend-cached-site7-local | 249 | backend backend-cached-site7-local |
685 | 250 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
686 | 274 | http-request set-header Host site7.local | 251 | http-request set-header Host site7.local |
687 | 275 | http-request set-header X-Cache-Request-IP %[src] | 252 | http-request set-header X-Cache-Request-IP %[src] |
688 | 276 | http-check send hdr Host site7.local | ||
689 | 277 | http-check send hdr User-Agent haproxy/httpchk | ||
690 | 278 | option httpchk HEAD / HTTP/1.0 | ||
691 | 279 | balance roundrobin | 253 | balance roundrobin |
692 | 280 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 254 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
693 | 281 | 255 | ||
694 | 282 | backend backend-site7-local | 256 | backend backend-site7-local |
695 | 257 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
696 | 283 | http-request set-header Host site7.local | 258 | http-request set-header Host site7.local |
697 | 284 | http-check send hdr Host site7.local | ||
698 | 285 | http-check send hdr User-Agent haproxy/httpchk | ||
699 | 286 | option httpchk HEAD / HTTP/1.0 | ||
700 | 287 | option redispatch 1 | 259 | option redispatch 1 |
701 | 288 | balance roundrobin | 260 | balance roundrobin |
702 | 289 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 261 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
703 | 290 | 262 | ||
704 | 291 | backend backend-cached-site8-local | 263 | backend backend-cached-site8-local |
705 | 264 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
706 | 292 | http-request set-header Host site8.local | 265 | http-request set-header Host site8.local |
707 | 293 | http-request set-header X-Cache-Request-IP %[src] | 266 | http-request set-header X-Cache-Request-IP %[src] |
708 | 294 | http-check send hdr Host site8.local | ||
709 | 295 | http-check send hdr User-Agent haproxy/httpchk | ||
710 | 296 | option httpchk HEAD / HTTP/1.0 | ||
711 | 297 | balance roundrobin | 267 | balance roundrobin |
712 | 298 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 268 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
713 | 299 | 269 | ||
714 | 300 | backend backend-site8-local | 270 | backend backend-site8-local |
715 | 271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
716 | 301 | http-request set-header Host site8.local | 272 | http-request set-header Host site8.local |
717 | 302 | http-check send hdr Host site8.local | ||
718 | 303 | http-check send hdr User-Agent haproxy/httpchk | ||
719 | 304 | option httpchk HEAD / HTTP/1.0 | ||
720 | 305 | option redispatch 1 | 273 | option redispatch 1 |
721 | 306 | balance roundrobin | 274 | balance roundrobin |
722 | 307 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 275 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
723 | 308 | 276 | ||
724 | 309 | backend backend-site8-local-2 | 277 | backend backend-site8-local-2 |
725 | 278 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
726 | 310 | http-request set-header Host auth.site8.local | 279 | http-request set-header Host auth.site8.local |
727 | 311 | http-check send hdr Host auth.site8.local | ||
728 | 312 | http-check send hdr User-Agent haproxy/httpchk | ||
729 | 313 | option httpchk HEAD / HTTP/1.0 | ||
730 | 314 | option redispatch 1 | 280 | option redispatch 1 |
731 | 315 | balance roundrobin | 281 | balance roundrobin |
732 | 316 | 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 | 282 | 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 |
733 | 317 | 283 | ||
734 | 318 | backend backend-cached-site9-local | 284 | backend backend-cached-site9-local |
735 | 285 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
736 | 319 | http-request set-header Host site9.local | 286 | http-request set-header Host site9.local |
737 | 320 | http-request set-header X-Cache-Request-IP %[src] | 287 | http-request set-header X-Cache-Request-IP %[src] |
738 | 321 | http-check send hdr Host site9.local | ||
739 | 322 | http-check send hdr User-Agent haproxy/httpchk | ||
740 | 323 | option httpchk HEAD / HTTP/1.0 | ||
741 | 324 | balance roundrobin | 288 | balance roundrobin |
742 | 325 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 289 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
743 | 326 | 290 | ||
744 | 327 | backend backend-site9-local | 291 | backend backend-site9-local |
745 | 292 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
746 | 328 | http-request set-header Host site9.local | 293 | http-request set-header Host site9.local |
747 | 329 | http-check send hdr Host site9.local | ||
748 | 330 | http-check send hdr User-Agent haproxy/httpchk | ||
749 | 331 | option httpchk HEAD / HTTP/1.0 | ||
750 | 332 | option redispatch 1 | 294 | option redispatch 1 |
751 | 333 | balance roundrobin | 295 | balance roundrobin |
752 | 334 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 296 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
753 | 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 | |||
754 | index 557a128..fb75f2e 100644 | |||
755 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt | |||
756 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt | |||
757 | @@ -156,19 +156,15 @@ listen site9-local | |||
758 | 156 | default_backend backend-site9-local | 156 | default_backend backend-site9-local |
759 | 157 | 157 | ||
760 | 158 | backend backend-cached-site1-local | 158 | backend backend-cached-site1-local |
761 | 159 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
762 | 159 | http-request set-header Host site1.local | 160 | http-request set-header Host site1.local |
763 | 160 | http-request set-header X-Cache-Request-IP %[src] | 161 | http-request set-header X-Cache-Request-IP %[src] |
764 | 161 | http-check send hdr Host site1.local | ||
765 | 162 | http-check send hdr User-Agent haproxy/httpchk | ||
766 | 163 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
767 | 164 | balance leastconn | 162 | balance leastconn |
768 | 165 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 163 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
769 | 166 | 164 | ||
770 | 167 | backend backend-site1-local | 165 | backend backend-site1-local |
771 | 166 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
772 | 168 | http-request set-header Host site1.local | 167 | http-request set-header Host site1.local |
773 | 169 | http-check send hdr Host site1.local | ||
774 | 170 | http-check send hdr User-Agent haproxy/httpchk | ||
775 | 171 | option httpchk HEAD / HTTP/1.0 | ||
776 | 172 | option redispatch 1 | 168 | option redispatch 1 |
777 | 173 | balance leastconn | 169 | balance leastconn |
778 | 174 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 170 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
779 | @@ -176,19 +172,15 @@ backend backend-site1-local | |||
780 | 176 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 172 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
781 | 177 | 173 | ||
782 | 178 | backend backend-cached-site2-local | 174 | backend backend-cached-site2-local |
783 | 175 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
784 | 179 | http-request set-header Host site2.local | 176 | http-request set-header Host site2.local |
785 | 180 | http-request set-header X-Cache-Request-IP %[src] | 177 | http-request set-header X-Cache-Request-IP %[src] |
786 | 181 | http-check send hdr Host site2.local | ||
787 | 182 | http-check send hdr User-Agent haproxy/httpchk | ||
788 | 183 | option httpchk GET /check/ HTTP/1.0 | ||
789 | 184 | balance leastconn | 178 | balance leastconn |
790 | 185 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 179 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
791 | 186 | 180 | ||
792 | 187 | backend backend-site2-local | 181 | backend backend-site2-local |
793 | 182 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
794 | 188 | http-request set-header Host site2.local | 183 | http-request set-header Host site2.local |
795 | 189 | http-check send hdr Host site2.local | ||
796 | 190 | http-check send hdr User-Agent haproxy/httpchk | ||
797 | 191 | option httpchk GET /check/ HTTP/1.0 | ||
798 | 192 | option redispatch 1 | 184 | option redispatch 1 |
799 | 193 | balance leastconn | 185 | balance leastconn |
800 | 194 | 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 | 186 | 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 |
801 | @@ -196,19 +188,15 @@ backend backend-site2-local | |||
802 | 196 | server server_3 127.0.1.12: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 | 188 | server server_3 127.0.1.12: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 |
803 | 197 | 189 | ||
804 | 198 | backend backend-cached-site3-local | 190 | backend backend-cached-site3-local |
805 | 191 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
806 | 199 | http-request set-header Host site3.local | 192 | http-request set-header Host site3.local |
807 | 200 | http-request set-header X-Cache-Request-IP %[src] | 193 | http-request set-header X-Cache-Request-IP %[src] |
808 | 201 | http-check send hdr Host site3.local | ||
809 | 202 | http-check send hdr User-Agent haproxy/httpchk | ||
810 | 203 | option httpchk HEAD / HTTP/1.0 | ||
811 | 204 | balance leastconn | 194 | balance leastconn |
812 | 205 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 195 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
813 | 206 | 196 | ||
814 | 207 | backend backend-site3-local | 197 | backend backend-site3-local |
815 | 198 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
816 | 208 | http-request set-header Host site3.local | 199 | http-request set-header Host site3.local |
817 | 209 | http-check send hdr Host site3.local | ||
818 | 210 | http-check send hdr User-Agent haproxy/httpchk | ||
819 | 211 | option httpchk HEAD / HTTP/1.0 | ||
820 | 212 | option forwardfor except 127.0.0.1 192.168.1.1 | 200 | option forwardfor except 127.0.0.1 192.168.1.1 |
821 | 213 | option forceclose | 201 | option forceclose |
822 | 214 | option redispatch 1 | 202 | option redispatch 1 |
823 | @@ -218,118 +206,92 @@ backend backend-site3-local | |||
824 | 218 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 206 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
825 | 219 | 207 | ||
826 | 220 | backend backend-cached-site4-local | 208 | backend backend-cached-site4-local |
827 | 209 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | ||
828 | 221 | http-request set-header Host site4.local | 210 | http-request set-header Host site4.local |
829 | 222 | http-request set-header X-Cache-Request-IP %[src] | 211 | http-request set-header X-Cache-Request-IP %[src] |
830 | 223 | http-check send hdr Host site4.local | ||
831 | 224 | http-check send hdr User-Agent haproxy/httpchk | ||
832 | 225 | option httpchk HEAD / HTTP/1.0 | ||
833 | 226 | balance leastconn | 212 | balance leastconn |
834 | 227 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 213 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
835 | 228 | 214 | ||
836 | 229 | backend backend-cached-site5 | 215 | backend backend-cached-site5 |
837 | 216 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
838 | 230 | http-request set-header Host site5.local | 217 | http-request set-header Host site5.local |
839 | 231 | http-request set-header X-Cache-Request-IP %[src] | 218 | http-request set-header X-Cache-Request-IP %[src] |
840 | 232 | http-check send hdr Host site5.local | ||
841 | 233 | http-check send hdr User-Agent haproxy/httpchk | ||
842 | 234 | option httpchk HEAD / HTTP/1.0 | ||
843 | 235 | balance leastconn | 219 | balance leastconn |
844 | 236 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 220 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
845 | 237 | 221 | ||
846 | 238 | backend backend-site5 | 222 | backend backend-site5 |
847 | 223 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
848 | 239 | http-request set-header Host site5.local | 224 | http-request set-header Host site5.local |
849 | 240 | http-check send hdr Host site5.local | ||
850 | 241 | http-check send hdr User-Agent haproxy/httpchk | ||
851 | 242 | option httpchk HEAD / HTTP/1.0 | ||
852 | 243 | option redispatch 1 | 225 | option redispatch 1 |
853 | 244 | balance leastconn | 226 | balance leastconn |
854 | 245 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 227 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
855 | 246 | 228 | ||
856 | 247 | backend backend-site5-2 | 229 | backend backend-site5-2 |
857 | 230 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
858 | 248 | http-request set-header Host site5.local | 231 | http-request set-header Host site5.local |
859 | 249 | http-check send hdr Host site5.local | ||
860 | 250 | http-check send hdr User-Agent haproxy/httpchk | ||
861 | 251 | option httpchk HEAD / HTTP/1.0 | ||
862 | 252 | option redispatch 1 | 232 | option redispatch 1 |
863 | 253 | balance leastconn | 233 | balance leastconn |
864 | 254 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 234 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
865 | 255 | 235 | ||
866 | 256 | backend backend-cached-site6-local | 236 | backend backend-cached-site6-local |
867 | 237 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
868 | 257 | http-request set-header Host site6.local | 238 | http-request set-header Host site6.local |
869 | 258 | http-request set-header X-Cache-Request-IP %[src] | 239 | http-request set-header X-Cache-Request-IP %[src] |
870 | 259 | http-check send hdr Host site6.local | ||
871 | 260 | http-check send hdr User-Agent haproxy/httpchk | ||
872 | 261 | option httpchk HEAD / HTTP/1.0 | ||
873 | 262 | balance leastconn | 240 | balance leastconn |
874 | 263 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 241 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
875 | 264 | 242 | ||
876 | 265 | backend backend-site6-local | 243 | backend backend-site6-local |
877 | 244 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
878 | 266 | http-request set-header Host site6.local | 245 | http-request set-header Host site6.local |
879 | 267 | http-check send hdr Host site6.local | ||
880 | 268 | http-check send hdr User-Agent haproxy/httpchk | ||
881 | 269 | option httpchk HEAD / HTTP/1.0 | ||
882 | 270 | option redispatch 1 | 246 | option redispatch 1 |
883 | 271 | balance leastconn | 247 | balance leastconn |
884 | 272 | 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 | 248 | 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 |
885 | 273 | 249 | ||
886 | 274 | backend backend-cached-site7-local | 250 | backend backend-cached-site7-local |
887 | 251 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
888 | 275 | http-request set-header Host site7.local | 252 | http-request set-header Host site7.local |
889 | 276 | http-request set-header X-Cache-Request-IP %[src] | 253 | http-request set-header X-Cache-Request-IP %[src] |
890 | 277 | http-check send hdr Host site7.local | ||
891 | 278 | http-check send hdr User-Agent haproxy/httpchk | ||
892 | 279 | option httpchk HEAD / HTTP/1.0 | ||
893 | 280 | balance leastconn | 254 | balance leastconn |
894 | 281 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 255 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
895 | 282 | 256 | ||
896 | 283 | backend backend-site7-local | 257 | backend backend-site7-local |
897 | 258 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
898 | 284 | http-request set-header Host site7.local | 259 | http-request set-header Host site7.local |
899 | 285 | http-check send hdr Host site7.local | ||
900 | 286 | http-check send hdr User-Agent haproxy/httpchk | ||
901 | 287 | option httpchk HEAD / HTTP/1.0 | ||
902 | 288 | option redispatch 1 | 260 | option redispatch 1 |
903 | 289 | balance leastconn | 261 | balance leastconn |
904 | 290 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 262 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
905 | 291 | 263 | ||
906 | 292 | backend backend-cached-site8-local | 264 | backend backend-cached-site8-local |
907 | 265 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
908 | 293 | http-request set-header Host site8.local | 266 | http-request set-header Host site8.local |
909 | 294 | http-request set-header X-Cache-Request-IP %[src] | 267 | http-request set-header X-Cache-Request-IP %[src] |
910 | 295 | http-check send hdr Host site8.local | ||
911 | 296 | http-check send hdr User-Agent haproxy/httpchk | ||
912 | 297 | option httpchk HEAD / HTTP/1.0 | ||
913 | 298 | balance leastconn | 268 | balance leastconn |
914 | 299 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 269 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
915 | 300 | 270 | ||
916 | 301 | backend backend-site8-local | 271 | backend backend-site8-local |
917 | 272 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
918 | 302 | http-request set-header Host site8.local | 273 | http-request set-header Host site8.local |
919 | 303 | http-check send hdr Host site8.local | ||
920 | 304 | http-check send hdr User-Agent haproxy/httpchk | ||
921 | 305 | option httpchk HEAD / HTTP/1.0 | ||
922 | 306 | option redispatch 1 | 274 | option redispatch 1 |
923 | 307 | balance leastconn | 275 | balance leastconn |
924 | 308 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 276 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
925 | 309 | 277 | ||
926 | 310 | backend backend-site8-local-2 | 278 | backend backend-site8-local-2 |
927 | 279 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
928 | 311 | http-request set-header Host auth.site8.local | 280 | http-request set-header Host auth.site8.local |
929 | 312 | http-check send hdr Host auth.site8.local | ||
930 | 313 | http-check send hdr User-Agent haproxy/httpchk | ||
931 | 314 | option httpchk HEAD / HTTP/1.0 | ||
932 | 315 | option redispatch 1 | 281 | option redispatch 1 |
933 | 316 | balance leastconn | 282 | balance leastconn |
934 | 317 | 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 | 283 | 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 |
935 | 318 | 284 | ||
936 | 319 | backend backend-cached-site9-local | 285 | backend backend-cached-site9-local |
937 | 286 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
938 | 320 | http-request set-header Host site9.local | 287 | http-request set-header Host site9.local |
939 | 321 | http-request set-header X-Cache-Request-IP %[src] | 288 | http-request set-header X-Cache-Request-IP %[src] |
940 | 322 | http-check send hdr Host site9.local | ||
941 | 323 | http-check send hdr User-Agent haproxy/httpchk | ||
942 | 324 | option httpchk HEAD / HTTP/1.0 | ||
943 | 325 | balance leastconn | 289 | balance leastconn |
944 | 326 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 290 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
945 | 327 | 291 | ||
946 | 328 | backend backend-site9-local | 292 | backend backend-site9-local |
947 | 293 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
948 | 329 | http-request set-header Host site9.local | 294 | http-request set-header Host site9.local |
949 | 330 | http-check send hdr Host site9.local | ||
950 | 331 | http-check send hdr User-Agent haproxy/httpchk | ||
951 | 332 | option httpchk HEAD / HTTP/1.0 | ||
952 | 333 | option redispatch 1 | 295 | option redispatch 1 |
953 | 334 | balance leastconn | 296 | balance leastconn |
954 | 335 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 297 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
955 | 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 | |||
956 | index f232c44..f6c4138 100644 | |||
957 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt | |||
958 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads_haproxy2.txt | |||
959 | @@ -155,19 +155,15 @@ listen site9-local | |||
960 | 155 | default_backend backend-site9-local | 155 | default_backend backend-site9-local |
961 | 156 | 156 | ||
962 | 157 | backend backend-cached-site1-local | 157 | backend backend-cached-site1-local |
963 | 158 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
964 | 158 | http-request set-header Host site1.local | 159 | http-request set-header Host site1.local |
965 | 159 | http-request set-header X-Cache-Request-IP %[src] | 160 | http-request set-header X-Cache-Request-IP %[src] |
966 | 160 | http-check send hdr Host site1.local | ||
967 | 161 | http-check send hdr User-Agent haproxy/httpchk | ||
968 | 162 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
969 | 163 | balance leastconn | 161 | balance leastconn |
970 | 164 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 | 162 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 600 |
971 | 165 | 163 | ||
972 | 166 | backend backend-site1-local | 164 | backend backend-site1-local |
973 | 165 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
974 | 167 | http-request set-header Host site1.local | 166 | http-request set-header Host site1.local |
975 | 168 | http-check send hdr Host site1.local | ||
976 | 169 | http-check send hdr User-Agent haproxy/httpchk | ||
977 | 170 | option httpchk HEAD / HTTP/1.0 | ||
978 | 171 | retry-on all-retryable-errors | 167 | retry-on all-retryable-errors |
979 | 172 | option redispatch 1 | 168 | option redispatch 1 |
980 | 173 | balance leastconn | 169 | balance leastconn |
981 | @@ -176,19 +172,15 @@ backend backend-site1-local | |||
982 | 176 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 172 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
983 | 177 | 173 | ||
984 | 178 | backend backend-cached-site2-local | 174 | backend backend-cached-site2-local |
985 | 175 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
986 | 179 | http-request set-header Host site2.local | 176 | http-request set-header Host site2.local |
987 | 180 | http-request set-header X-Cache-Request-IP %[src] | 177 | http-request set-header X-Cache-Request-IP %[src] |
988 | 181 | http-check send hdr Host site2.local | ||
989 | 182 | http-check send hdr User-Agent haproxy/httpchk | ||
990 | 183 | option httpchk GET /check/ HTTP/1.0 | ||
991 | 184 | balance leastconn | 178 | balance leastconn |
992 | 185 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 | 179 | server server_1 127.0.0.1:6081 check inter 2s rise 2 fall 60 maxconn 3072 |
993 | 186 | 180 | ||
994 | 187 | backend backend-site2-local | 181 | backend backend-site2-local |
995 | 182 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
996 | 188 | http-request set-header Host site2.local | 183 | http-request set-header Host site2.local |
997 | 189 | http-check send hdr Host site2.local | ||
998 | 190 | http-check send hdr User-Agent haproxy/httpchk | ||
999 | 191 | option httpchk GET /check/ HTTP/1.0 | ||
1000 | 192 | retry-on all-retryable-errors | 184 | retry-on all-retryable-errors |
1001 | 193 | option redispatch 1 | 185 | option redispatch 1 |
1002 | 194 | balance leastconn | 186 | balance leastconn |
1003 | @@ -197,19 +189,15 @@ backend backend-site2-local | |||
1004 | 197 | server server_3 127.0.1.12: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 | 189 | server server_3 127.0.1.12: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 |
1005 | 198 | 190 | ||
1006 | 199 | backend backend-cached-site3-local | 191 | backend backend-cached-site3-local |
1007 | 192 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
1008 | 200 | http-request set-header Host site3.local | 193 | http-request set-header Host site3.local |
1009 | 201 | http-request set-header X-Cache-Request-IP %[src] | 194 | http-request set-header X-Cache-Request-IP %[src] |
1010 | 202 | http-check send hdr Host site3.local | ||
1011 | 203 | http-check send hdr User-Agent haproxy/httpchk | ||
1012 | 204 | option httpchk HEAD / HTTP/1.0 | ||
1013 | 205 | balance leastconn | 195 | balance leastconn |
1014 | 206 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 | 196 | server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096 |
1015 | 207 | 197 | ||
1016 | 208 | backend backend-site3-local | 198 | backend backend-site3-local |
1017 | 199 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
1018 | 209 | http-request set-header Host site3.local | 200 | http-request set-header Host site3.local |
1019 | 210 | http-check send hdr Host site3.local | ||
1020 | 211 | http-check send hdr User-Agent haproxy/httpchk | ||
1021 | 212 | option httpchk HEAD / HTTP/1.0 | ||
1022 | 213 | option forwardfor except 127.0.0.1 192.168.1.1 | 201 | option forwardfor except 127.0.0.1 192.168.1.1 |
1023 | 214 | option forceclose | 202 | option forceclose |
1024 | 215 | retry-on all-retryable-errors | 203 | retry-on all-retryable-errors |
1025 | @@ -220,124 +208,98 @@ backend backend-site3-local | |||
1026 | 220 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 208 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1027 | 221 | 209 | ||
1028 | 222 | backend backend-cached-site4-local | 210 | backend backend-cached-site4-local |
1029 | 211 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site4.local\r\nUser-Agent:\ haproxy/httpchk | ||
1030 | 223 | http-request set-header Host site4.local | 212 | http-request set-header Host site4.local |
1031 | 224 | http-request set-header X-Cache-Request-IP %[src] | 213 | http-request set-header X-Cache-Request-IP %[src] |
1032 | 225 | http-check send hdr Host site4.local | ||
1033 | 226 | http-check send hdr User-Agent haproxy/httpchk | ||
1034 | 227 | option httpchk HEAD / HTTP/1.0 | ||
1035 | 228 | balance leastconn | 214 | balance leastconn |
1036 | 229 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 | 215 | server server_1 127.0.0.1:6083 check inter 2s rise 2 fall 60 maxconn 200 |
1037 | 230 | 216 | ||
1038 | 231 | backend backend-cached-site5 | 217 | backend backend-cached-site5 |
1039 | 218 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1040 | 232 | http-request set-header Host site5.local | 219 | http-request set-header Host site5.local |
1041 | 233 | http-request set-header X-Cache-Request-IP %[src] | 220 | http-request set-header X-Cache-Request-IP %[src] |
1042 | 234 | http-check send hdr Host site5.local | ||
1043 | 235 | http-check send hdr User-Agent haproxy/httpchk | ||
1044 | 236 | option httpchk HEAD / HTTP/1.0 | ||
1045 | 237 | balance leastconn | 221 | balance leastconn |
1046 | 238 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 | 222 | server server_1 127.0.0.1:6084 check inter 2s rise 2 fall 60 maxconn 200 |
1047 | 239 | 223 | ||
1048 | 240 | backend backend-site5 | 224 | backend backend-site5 |
1049 | 225 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1050 | 241 | http-request set-header Host site5.local | 226 | http-request set-header Host site5.local |
1051 | 242 | http-check send hdr Host site5.local | ||
1052 | 243 | http-check send hdr User-Agent haproxy/httpchk | ||
1053 | 244 | option httpchk HEAD / HTTP/1.0 | ||
1054 | 245 | retry-on all-retryable-errors | 227 | retry-on all-retryable-errors |
1055 | 246 | option redispatch 1 | 228 | option redispatch 1 |
1056 | 247 | balance leastconn | 229 | balance leastconn |
1057 | 248 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 230 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1058 | 249 | 231 | ||
1059 | 250 | backend backend-site5-2 | 232 | backend backend-site5-2 |
1060 | 233 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1061 | 251 | http-request set-header Host site5.local | 234 | http-request set-header Host site5.local |
1062 | 252 | http-check send hdr Host site5.local | ||
1063 | 253 | http-check send hdr User-Agent haproxy/httpchk | ||
1064 | 254 | option httpchk HEAD / HTTP/1.0 | ||
1065 | 255 | retry-on all-retryable-errors | 235 | retry-on all-retryable-errors |
1066 | 256 | option redispatch 1 | 236 | option redispatch 1 |
1067 | 257 | balance leastconn | 237 | balance leastconn |
1068 | 258 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 238 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1069 | 259 | 239 | ||
1070 | 260 | backend backend-cached-site6-local | 240 | backend backend-cached-site6-local |
1071 | 241 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
1072 | 261 | http-request set-header Host site6.local | 242 | http-request set-header Host site6.local |
1073 | 262 | http-request set-header X-Cache-Request-IP %[src] | 243 | http-request set-header X-Cache-Request-IP %[src] |
1074 | 263 | http-check send hdr Host site6.local | ||
1075 | 264 | http-check send hdr User-Agent haproxy/httpchk | ||
1076 | 265 | option httpchk HEAD / HTTP/1.0 | ||
1077 | 266 | balance leastconn | 244 | balance leastconn |
1078 | 267 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 | 245 | server server_1 127.0.0.1:6085 check inter 2s rise 2 fall 60 maxconn 200 |
1079 | 268 | 246 | ||
1080 | 269 | backend backend-site6-local | 247 | backend backend-site6-local |
1081 | 248 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
1082 | 270 | http-request set-header Host site6.local | 249 | http-request set-header Host site6.local |
1083 | 271 | http-check send hdr Host site6.local | ||
1084 | 272 | http-check send hdr User-Agent haproxy/httpchk | ||
1085 | 273 | option httpchk HEAD / HTTP/1.0 | ||
1086 | 274 | retry-on all-retryable-errors | 250 | retry-on all-retryable-errors |
1087 | 275 | option redispatch 1 | 251 | option redispatch 1 |
1088 | 276 | balance leastconn | 252 | balance leastconn |
1089 | 277 | 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 | 253 | 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 |
1090 | 278 | 254 | ||
1091 | 279 | backend backend-cached-site7-local | 255 | backend backend-cached-site7-local |
1092 | 256 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
1093 | 280 | http-request set-header Host site7.local | 257 | http-request set-header Host site7.local |
1094 | 281 | http-request set-header X-Cache-Request-IP %[src] | 258 | http-request set-header X-Cache-Request-IP %[src] |
1095 | 282 | http-check send hdr Host site7.local | ||
1096 | 283 | http-check send hdr User-Agent haproxy/httpchk | ||
1097 | 284 | option httpchk HEAD / HTTP/1.0 | ||
1098 | 285 | balance leastconn | 259 | balance leastconn |
1099 | 286 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 | 260 | server server_1 127.0.0.1:6086 check inter 2s rise 2 fall 60 maxconn 200 |
1100 | 287 | 261 | ||
1101 | 288 | backend backend-site7-local | 262 | backend backend-site7-local |
1102 | 263 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
1103 | 289 | http-request set-header Host site7.local | 264 | http-request set-header Host site7.local |
1104 | 290 | http-check send hdr Host site7.local | ||
1105 | 291 | http-check send hdr User-Agent haproxy/httpchk | ||
1106 | 292 | option httpchk HEAD / HTTP/1.0 | ||
1107 | 293 | retry-on all-retryable-errors | 265 | retry-on all-retryable-errors |
1108 | 294 | option redispatch 1 | 266 | option redispatch 1 |
1109 | 295 | balance leastconn | 267 | balance leastconn |
1110 | 296 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 268 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1111 | 297 | 269 | ||
1112 | 298 | backend backend-cached-site8-local | 270 | backend backend-cached-site8-local |
1113 | 271 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1114 | 299 | http-request set-header Host site8.local | 272 | http-request set-header Host site8.local |
1115 | 300 | http-request set-header X-Cache-Request-IP %[src] | 273 | http-request set-header X-Cache-Request-IP %[src] |
1116 | 301 | http-check send hdr Host site8.local | ||
1117 | 302 | http-check send hdr User-Agent haproxy/httpchk | ||
1118 | 303 | option httpchk HEAD / HTTP/1.0 | ||
1119 | 304 | balance leastconn | 274 | balance leastconn |
1120 | 305 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 | 275 | server server_1 127.0.0.1:6087 check inter 2s rise 2 fall 60 maxconn 200 |
1121 | 306 | 276 | ||
1122 | 307 | backend backend-site8-local | 277 | backend backend-site8-local |
1123 | 278 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1124 | 308 | http-request set-header Host site8.local | 279 | http-request set-header Host site8.local |
1125 | 309 | http-check send hdr Host site8.local | ||
1126 | 310 | http-check send hdr User-Agent haproxy/httpchk | ||
1127 | 311 | option httpchk HEAD / HTTP/1.0 | ||
1128 | 312 | retry-on all-retryable-errors | 280 | retry-on all-retryable-errors |
1129 | 313 | option redispatch 1 | 281 | option redispatch 1 |
1130 | 314 | balance leastconn | 282 | balance leastconn |
1131 | 315 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 283 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1132 | 316 | 284 | ||
1133 | 317 | backend backend-site8-local-2 | 285 | backend backend-site8-local-2 |
1134 | 286 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1135 | 318 | http-request set-header Host auth.site8.local | 287 | http-request set-header Host auth.site8.local |
1136 | 319 | http-check send hdr Host auth.site8.local | ||
1137 | 320 | http-check send hdr User-Agent haproxy/httpchk | ||
1138 | 321 | option httpchk HEAD / HTTP/1.0 | ||
1139 | 322 | retry-on all-retryable-errors | 288 | retry-on all-retryable-errors |
1140 | 323 | option redispatch 1 | 289 | option redispatch 1 |
1141 | 324 | balance leastconn | 290 | balance leastconn |
1142 | 325 | 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 | 291 | 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 |
1143 | 326 | 292 | ||
1144 | 327 | backend backend-cached-site9-local | 293 | backend backend-cached-site9-local |
1145 | 294 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
1146 | 328 | http-request set-header Host site9.local | 295 | http-request set-header Host site9.local |
1147 | 329 | http-request set-header X-Cache-Request-IP %[src] | 296 | http-request set-header X-Cache-Request-IP %[src] |
1148 | 330 | http-check send hdr Host site9.local | ||
1149 | 331 | http-check send hdr User-Agent haproxy/httpchk | ||
1150 | 332 | option httpchk HEAD / HTTP/1.0 | ||
1151 | 333 | balance leastconn | 297 | balance leastconn |
1152 | 334 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 | 298 | server server_1 127.0.0.1:6088 check inter 2s rise 2 fall 60 maxconn 200 |
1153 | 335 | 299 | ||
1154 | 336 | backend backend-site9-local | 300 | backend backend-site9-local |
1155 | 301 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
1156 | 337 | http-request set-header Host site9.local | 302 | http-request set-header Host site9.local |
1157 | 338 | http-check send hdr Host site9.local | ||
1158 | 339 | http-check send hdr User-Agent haproxy/httpchk | ||
1159 | 340 | option httpchk HEAD / HTTP/1.0 | ||
1160 | 341 | retry-on all-retryable-errors | 303 | retry-on all-retryable-errors |
1161 | 342 | option redispatch 1 | 304 | option redispatch 1 |
1162 | 343 | balance leastconn | 305 | balance leastconn |
1163 | 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 | |||
1164 | index d25cb73..72b12df 100644 | |||
1165 | --- a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt | |||
1166 | +++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt | |||
1167 | @@ -90,19 +90,15 @@ listen site1-local | |||
1168 | 90 | default_backend backend-site1-local | 90 | default_backend backend-site1-local |
1169 | 91 | 91 | ||
1170 | 92 | backend backend-cached-site1-local | 92 | backend backend-cached-site1-local |
1171 | 93 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
1172 | 93 | http-request set-header Host site1.local | 94 | http-request set-header Host site1.local |
1173 | 94 | http-request set-header X-Cache-Request-IP %[src] | 95 | http-request set-header X-Cache-Request-IP %[src] |
1174 | 95 | http-check send hdr Host site1.local | ||
1175 | 96 | http-check send hdr User-Agent haproxy/httpchk | ||
1176 | 97 | option httpchk HEAD / HTTP/1.0 | ||
1177 | 98 | balance leastconn | 96 | balance leastconn |
1178 | 99 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 | 97 | server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 400 |
1179 | 100 | 98 | ||
1180 | 101 | backend backend-site1-local | 99 | backend backend-site1-local |
1181 | 100 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
1182 | 102 | http-request set-header Host site1.local | 101 | http-request set-header Host site1.local |
1183 | 103 | http-check send hdr Host site1.local | ||
1184 | 104 | http-check send hdr User-Agent haproxy/httpchk | ||
1185 | 105 | option httpchk HEAD / HTTP/1.0 | ||
1186 | 106 | option redispatch 1 | 102 | option redispatch 1 |
1187 | 107 | balance leastconn | 103 | balance leastconn |
1188 | 108 | 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 | 104 | 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 |
1189 | diff --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 | |||
1190 | index 0e56720..227a011 100644 | |||
1191 | --- a/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt | |||
1192 | +++ b/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt | |||
1193 | @@ -1,29 +1,23 @@ | |||
1194 | 1 | 1 | ||
1195 | 2 | backend backend-site1-local | 2 | backend backend-site1-local |
1196 | 3 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
1197 | 3 | http-request set-header Host site1.local | 4 | http-request set-header Host site1.local |
1198 | 4 | http-check send hdr Host site1.local | ||
1199 | 5 | http-check send hdr User-Agent haproxy/httpchk | ||
1200 | 6 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
1201 | 7 | balance leastconn | 5 | balance leastconn |
1202 | 8 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 6 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1203 | 9 | server server_2 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 7 | server server_2 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1204 | 10 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 8 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1205 | 11 | 9 | ||
1206 | 12 | backend backend-site2-local | 10 | backend backend-site2-local |
1207 | 11 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
1208 | 13 | http-request set-header Host site2.local | 12 | http-request set-header Host site2.local |
1209 | 14 | http-check send hdr Host site2.local | ||
1210 | 15 | http-check send hdr User-Agent haproxy/httpchk | ||
1211 | 16 | option httpchk GET /check/ HTTP/1.0 | ||
1212 | 17 | balance leastconn | 13 | balance leastconn |
1213 | 18 | 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 | 14 | 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 |
1214 | 19 | server server_2 127.0.1.11: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 | 15 | server server_2 127.0.1.11: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 |
1215 | 20 | server server_3 127.0.1.12: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 | 16 | server server_3 127.0.1.12: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 |
1216 | 21 | 17 | ||
1217 | 22 | backend backend-site3-local | 18 | backend backend-site3-local |
1218 | 19 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
1219 | 23 | http-request set-header Host site3.local | 20 | http-request set-header Host site3.local |
1220 | 24 | http-check send hdr Host site3.local | ||
1221 | 25 | http-check send hdr User-Agent haproxy/httpchk | ||
1222 | 26 | option httpchk HEAD / HTTP/1.0 | ||
1223 | 27 | option forwardfor except 127.0.0.1 192.168.1.1 | 21 | option forwardfor except 127.0.0.1 192.168.1.1 |
1224 | 28 | option forceclose | 22 | option forceclose |
1225 | 29 | balance leastconn | 23 | balance leastconn |
1226 | @@ -32,57 +26,43 @@ backend backend-site3-local | |||
1227 | 32 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 26 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1228 | 33 | 27 | ||
1229 | 34 | backend backend-site5 | 28 | backend backend-site5 |
1230 | 29 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1231 | 35 | http-request set-header Host site5.local | 30 | http-request set-header Host site5.local |
1232 | 36 | http-check send hdr Host site5.local | ||
1233 | 37 | http-check send hdr User-Agent haproxy/httpchk | ||
1234 | 38 | option httpchk HEAD / HTTP/1.0 | ||
1235 | 39 | balance leastconn | 31 | balance leastconn |
1236 | 40 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 32 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1237 | 41 | 33 | ||
1238 | 42 | backend backend-site5-2 | 34 | backend backend-site5-2 |
1239 | 35 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1240 | 43 | http-request set-header Host site5.local | 36 | http-request set-header Host site5.local |
1241 | 44 | http-check send hdr Host site5.local | ||
1242 | 45 | http-check send hdr User-Agent haproxy/httpchk | ||
1243 | 46 | option httpchk HEAD / HTTP/1.0 | ||
1244 | 47 | balance leastconn | 37 | balance leastconn |
1245 | 48 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 38 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1246 | 49 | 39 | ||
1247 | 50 | backend backend-site6-local | 40 | backend backend-site6-local |
1248 | 41 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
1249 | 51 | http-request set-header Host site6.local | 42 | http-request set-header Host site6.local |
1250 | 52 | http-check send hdr Host site6.local | ||
1251 | 53 | http-check send hdr User-Agent haproxy/httpchk | ||
1252 | 54 | option httpchk HEAD / HTTP/1.0 | ||
1253 | 55 | balance leastconn | 43 | balance leastconn |
1254 | 56 | 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 | 44 | 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 |
1255 | 57 | 45 | ||
1256 | 58 | backend backend-site7-local | 46 | backend backend-site7-local |
1257 | 47 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
1258 | 59 | http-request set-header Host site7.local | 48 | http-request set-header Host site7.local |
1259 | 60 | http-check send hdr Host site7.local | ||
1260 | 61 | http-check send hdr User-Agent haproxy/httpchk | ||
1261 | 62 | option httpchk HEAD / HTTP/1.0 | ||
1262 | 63 | balance leastconn | 49 | balance leastconn |
1263 | 64 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 50 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1264 | 65 | 51 | ||
1265 | 66 | backend backend-site8-local | 52 | backend backend-site8-local |
1266 | 53 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1267 | 67 | http-request set-header Host site8.local | 54 | http-request set-header Host site8.local |
1268 | 68 | http-check send hdr Host site8.local | ||
1269 | 69 | http-check send hdr User-Agent haproxy/httpchk | ||
1270 | 70 | option httpchk HEAD / HTTP/1.0 | ||
1271 | 71 | balance leastconn | 55 | balance leastconn |
1272 | 72 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 56 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1273 | 73 | 57 | ||
1274 | 74 | backend backend-site8-local-2 | 58 | backend backend-site8-local-2 |
1275 | 59 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1276 | 75 | http-request set-header Host auth.site8.local | 60 | http-request set-header Host auth.site8.local |
1277 | 76 | http-check send hdr Host auth.site8.local | ||
1278 | 77 | http-check send hdr User-Agent haproxy/httpchk | ||
1279 | 78 | option httpchk HEAD / HTTP/1.0 | ||
1280 | 79 | balance leastconn | 61 | balance leastconn |
1281 | 80 | 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 | 62 | 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 |
1282 | 81 | 63 | ||
1283 | 82 | backend backend-site9-local | 64 | backend backend-site9-local |
1284 | 65 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
1285 | 83 | http-request set-header Host site9.local | 66 | http-request set-header Host site9.local |
1286 | 84 | http-check send hdr Host site9.local | ||
1287 | 85 | http-check send hdr User-Agent haproxy/httpchk | ||
1288 | 86 | option httpchk HEAD / HTTP/1.0 | ||
1289 | 87 | balance leastconn | 67 | balance leastconn |
1290 | 88 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 68 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
1291 | diff --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 | |||
1292 | index 1c8ea3c..e5812ab 100644 | |||
1293 | --- a/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt | |||
1294 | +++ b/tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output2.txt | |||
1295 | @@ -1,8 +1,6 @@ | |||
1296 | 1 | 1 | ||
1297 | 2 | backend backend-site1-local | 2 | backend backend-site1-local |
1298 | 3 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
1299 | 3 | http-request set-header Host site1.local | 4 | http-request set-header Host site1.local |
1300 | 4 | http-check send hdr Host site1.local | ||
1301 | 5 | http-check send hdr User-Agent haproxy/httpchk | ||
1302 | 6 | option httpchk HEAD / HTTP/1.0 | ||
1303 | 7 | balance leastconn | 5 | balance leastconn |
1304 | 8 | server server_1 archive.ubuntu.com:80 resolvers dns init-addr last,libc,none check inter 5s rise 2 fall 5 maxconn 200 | 6 | server server_1 archive.ubuntu.com:80 resolvers dns init-addr last,libc,none check inter 5s rise 2 fall 5 maxconn 200 |
1305 | diff --git a/tests/unit/files/haproxy_config_rendered_test_output.txt b/tests/unit/files/haproxy_config_rendered_test_output.txt | |||
1306 | index 650b4fd..0de7d52 100644 | |||
1307 | --- a/tests/unit/files/haproxy_config_rendered_test_output.txt | |||
1308 | +++ b/tests/unit/files/haproxy_config_rendered_test_output.txt | |||
1309 | @@ -106,30 +106,24 @@ listen combined-444 | |||
1310 | 106 | use_backend backend-site8-local if { hdr(Host) -i site8.local } | 106 | use_backend backend-site8-local if { hdr(Host) -i site8.local } |
1311 | 107 | 107 | ||
1312 | 108 | backend backend-site1-local | 108 | backend backend-site1-local |
1313 | 109 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
1314 | 109 | http-request set-header Host site1.local | 110 | http-request set-header Host site1.local |
1315 | 110 | http-check send hdr Host site1.local | ||
1316 | 111 | http-check send hdr User-Agent haproxy/httpchk | ||
1317 | 112 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
1318 | 113 | balance leastconn | 111 | balance leastconn |
1319 | 114 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 112 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1320 | 115 | server server_2 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 113 | server server_2 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1321 | 116 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 114 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1322 | 117 | 115 | ||
1323 | 118 | backend backend-site2-local | 116 | backend backend-site2-local |
1324 | 117 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
1325 | 119 | http-request set-header Host site2.local | 118 | http-request set-header Host site2.local |
1326 | 120 | http-check send hdr Host site2.local | ||
1327 | 121 | http-check send hdr User-Agent haproxy/httpchk | ||
1328 | 122 | option httpchk GET /check/ HTTP/1.0 | ||
1329 | 123 | balance leastconn | 119 | balance leastconn |
1330 | 124 | 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 | 120 | 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 |
1331 | 125 | server server_2 127.0.1.11: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 | 121 | server server_2 127.0.1.11: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 |
1332 | 126 | server server_3 127.0.1.12: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 | 122 | server server_3 127.0.1.12: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 |
1333 | 127 | 123 | ||
1334 | 128 | backend backend-site3-local | 124 | backend backend-site3-local |
1335 | 125 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
1336 | 129 | http-request set-header Host site3.local | 126 | http-request set-header Host site3.local |
1337 | 130 | http-check send hdr Host site3.local | ||
1338 | 131 | http-check send hdr User-Agent haproxy/httpchk | ||
1339 | 132 | option httpchk HEAD / HTTP/1.0 | ||
1340 | 133 | option forwardfor except 127.0.0.1 192.168.1.1 | 127 | option forwardfor except 127.0.0.1 192.168.1.1 |
1341 | 134 | option forceclose | 128 | option forceclose |
1342 | 135 | balance leastconn | 129 | balance leastconn |
1343 | @@ -138,57 +132,43 @@ backend backend-site3-local | |||
1344 | 138 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 132 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1345 | 139 | 133 | ||
1346 | 140 | backend backend-site5 | 134 | backend backend-site5 |
1347 | 135 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1348 | 141 | http-request set-header Host site5.local | 136 | http-request set-header Host site5.local |
1349 | 142 | http-check send hdr Host site5.local | ||
1350 | 143 | http-check send hdr User-Agent haproxy/httpchk | ||
1351 | 144 | option httpchk HEAD / HTTP/1.0 | ||
1352 | 145 | balance leastconn | 137 | balance leastconn |
1353 | 146 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 138 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1354 | 147 | 139 | ||
1355 | 148 | backend backend-site5-2 | 140 | backend backend-site5-2 |
1356 | 141 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1357 | 149 | http-request set-header Host site5.local | 142 | http-request set-header Host site5.local |
1358 | 150 | http-check send hdr Host site5.local | ||
1359 | 151 | http-check send hdr User-Agent haproxy/httpchk | ||
1360 | 152 | option httpchk HEAD / HTTP/1.0 | ||
1361 | 153 | balance leastconn | 143 | balance leastconn |
1362 | 154 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 144 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1363 | 155 | 145 | ||
1364 | 156 | backend backend-site6-local | 146 | backend backend-site6-local |
1365 | 147 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
1366 | 157 | http-request set-header Host site6.local | 148 | http-request set-header Host site6.local |
1367 | 158 | http-check send hdr Host site6.local | ||
1368 | 159 | http-check send hdr User-Agent haproxy/httpchk | ||
1369 | 160 | option httpchk HEAD / HTTP/1.0 | ||
1370 | 161 | balance leastconn | 149 | balance leastconn |
1371 | 162 | 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 | 150 | 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 |
1372 | 163 | 151 | ||
1373 | 164 | backend backend-site7-local | 152 | backend backend-site7-local |
1374 | 153 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
1375 | 165 | http-request set-header Host site7.local | 154 | http-request set-header Host site7.local |
1376 | 166 | http-check send hdr Host site7.local | ||
1377 | 167 | http-check send hdr User-Agent haproxy/httpchk | ||
1378 | 168 | option httpchk HEAD / HTTP/1.0 | ||
1379 | 169 | balance leastconn | 155 | balance leastconn |
1380 | 170 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 156 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1381 | 171 | 157 | ||
1382 | 172 | backend backend-site8-local | 158 | backend backend-site8-local |
1383 | 159 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1384 | 173 | http-request set-header Host site8.local | 160 | http-request set-header Host site8.local |
1385 | 174 | http-check send hdr Host site8.local | ||
1386 | 175 | http-check send hdr User-Agent haproxy/httpchk | ||
1387 | 176 | option httpchk HEAD / HTTP/1.0 | ||
1388 | 177 | balance leastconn | 161 | balance leastconn |
1389 | 178 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 162 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1390 | 179 | 163 | ||
1391 | 180 | backend backend-site8-local-2 | 164 | backend backend-site8-local-2 |
1392 | 165 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1393 | 181 | http-request set-header Host auth.site8.local | 166 | http-request set-header Host auth.site8.local |
1394 | 182 | http-check send hdr Host auth.site8.local | ||
1395 | 183 | http-check send hdr User-Agent haproxy/httpchk | ||
1396 | 184 | option httpchk HEAD / HTTP/1.0 | ||
1397 | 185 | balance leastconn | 167 | balance leastconn |
1398 | 186 | 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 | 168 | 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 |
1399 | 187 | 169 | ||
1400 | 188 | backend backend-site9-local | 170 | backend backend-site9-local |
1401 | 171 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
1402 | 189 | http-request set-header Host site9.local | 172 | http-request set-header Host site9.local |
1403 | 190 | http-check send hdr Host site9.local | ||
1404 | 191 | http-check send hdr User-Agent haproxy/httpchk | ||
1405 | 192 | option httpchk HEAD / HTTP/1.0 | ||
1406 | 193 | balance leastconn | 173 | balance leastconn |
1407 | 194 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 174 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
1408 | diff --git a/tests/unit/files/haproxy_config_rendered_test_output2.txt b/tests/unit/files/haproxy_config_rendered_test_output2.txt | |||
1409 | index 44ecadc..cba6290 100644 | |||
1410 | --- a/tests/unit/files/haproxy_config_rendered_test_output2.txt | |||
1411 | +++ b/tests/unit/files/haproxy_config_rendered_test_output2.txt | |||
1412 | @@ -106,30 +106,24 @@ listen combined-444 | |||
1413 | 106 | use_backend backend-site8-local if { hdr(Host) -i site8.local } | 106 | use_backend backend-site8-local if { hdr(Host) -i site8.local } |
1414 | 107 | 107 | ||
1415 | 108 | backend backend-site1-local | 108 | backend backend-site1-local |
1416 | 109 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk | ||
1417 | 109 | http-request set-header Host site1.local | 110 | http-request set-header Host site1.local |
1418 | 110 | http-check send hdr Host site1.local | ||
1419 | 111 | http-check send hdr User-Agent haproxy/httpchk | ||
1420 | 112 | option httpchk HEAD /?token=1861920000_f3e404e205ed44749e942d481f7a7bec57c5e78a HTTP/1.0 | ||
1421 | 113 | balance leastconn | 111 | balance leastconn |
1422 | 114 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 112 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1423 | 115 | server server_2 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 113 | server server_2 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1424 | 116 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 114 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1425 | 117 | 115 | ||
1426 | 118 | backend backend-site2-local | 116 | backend backend-site2-local |
1427 | 117 | option httpchk GET /check/ HTTP/1.0\r\nHost:\ site2.local\r\nUser-Agent:\ haproxy/httpchk | ||
1428 | 119 | http-request set-header Host site2.local | 118 | http-request set-header Host site2.local |
1429 | 120 | http-check send hdr Host site2.local | ||
1430 | 121 | http-check send hdr User-Agent haproxy/httpchk | ||
1431 | 122 | option httpchk GET /check/ HTTP/1.0 | ||
1432 | 123 | balance leastconn | 119 | balance leastconn |
1433 | 124 | 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 | 120 | 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 |
1434 | 125 | server server_2 127.0.1.11: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 | 121 | server server_2 127.0.1.11: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 |
1435 | 126 | server server_3 127.0.1.12: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 | 122 | server server_3 127.0.1.12: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 |
1436 | 127 | 123 | ||
1437 | 128 | backend backend-site3-local | 124 | backend backend-site3-local |
1438 | 125 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk | ||
1439 | 129 | http-request set-header Host site3.local | 126 | http-request set-header Host site3.local |
1440 | 130 | http-check send hdr Host site3.local | ||
1441 | 131 | http-check send hdr User-Agent haproxy/httpchk | ||
1442 | 132 | option httpchk HEAD / HTTP/1.0 | ||
1443 | 133 | option forwardfor except 127.0.0.1 192.168.1.1 | 127 | option forwardfor except 127.0.0.1 192.168.1.1 |
1444 | 134 | option forceclose | 128 | option forceclose |
1445 | 135 | balance leastconn | 129 | balance leastconn |
1446 | @@ -138,57 +132,43 @@ backend backend-site3-local | |||
1447 | 138 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 | 132 | server server_3 127.0.1.12:80 check inter 5s rise 2 fall 5 maxconn 200 |
1448 | 139 | 133 | ||
1449 | 140 | backend backend-site5 | 134 | backend backend-site5 |
1450 | 135 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1451 | 141 | http-request set-header Host site5.local | 136 | http-request set-header Host site5.local |
1452 | 142 | http-check send hdr Host site5.local | ||
1453 | 143 | http-check send hdr User-Agent haproxy/httpchk | ||
1454 | 144 | option httpchk HEAD / HTTP/1.0 | ||
1455 | 145 | balance leastconn | 137 | balance leastconn |
1456 | 146 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 138 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1457 | 147 | 139 | ||
1458 | 148 | backend backend-site5-2 | 140 | backend backend-site5-2 |
1459 | 141 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site5.local\r\nUser-Agent:\ haproxy/httpchk | ||
1460 | 149 | http-request set-header Host site5.local | 142 | http-request set-header Host site5.local |
1461 | 150 | http-check send hdr Host site5.local | ||
1462 | 151 | http-check send hdr User-Agent haproxy/httpchk | ||
1463 | 152 | option httpchk HEAD / HTTP/1.0 | ||
1464 | 153 | balance leastconn | 143 | balance leastconn |
1465 | 154 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 | 144 | server server_1 127.0.1.11:80 check inter 5s rise 2 fall 5 maxconn 200 |
1466 | 155 | 145 | ||
1467 | 156 | backend backend-site6-local | 146 | backend backend-site6-local |
1468 | 147 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site6.local\r\nUser-Agent:\ haproxy/httpchk | ||
1469 | 157 | http-request set-header Host site6.local | 148 | http-request set-header Host site6.local |
1470 | 158 | http-check send hdr Host site6.local | ||
1471 | 159 | http-check send hdr User-Agent haproxy/httpchk | ||
1472 | 160 | option httpchk HEAD / HTTP/1.0 | ||
1473 | 161 | balance leastconn | 149 | balance leastconn |
1474 | 162 | 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 | 150 | 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 |
1475 | 163 | 151 | ||
1476 | 164 | backend backend-site7-local | 152 | backend backend-site7-local |
1477 | 153 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site7.local\r\nUser-Agent:\ haproxy/httpchk | ||
1478 | 165 | http-request set-header Host site7.local | 154 | http-request set-header Host site7.local |
1479 | 166 | http-check send hdr Host site7.local | ||
1480 | 167 | http-check send hdr User-Agent haproxy/httpchk | ||
1481 | 168 | option httpchk HEAD / HTTP/1.0 | ||
1482 | 169 | balance leastconn | 155 | balance leastconn |
1483 | 170 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 156 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1484 | 171 | 157 | ||
1485 | 172 | backend backend-site8-local | 158 | backend backend-site8-local |
1486 | 159 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1487 | 173 | http-request set-header Host site8.local | 160 | http-request set-header Host site8.local |
1488 | 174 | http-check send hdr Host site8.local | ||
1489 | 175 | http-check send hdr User-Agent haproxy/httpchk | ||
1490 | 176 | option httpchk HEAD / HTTP/1.0 | ||
1491 | 177 | balance leastconn | 161 | balance leastconn |
1492 | 178 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 | 162 | server server_1 127.0.1.10:80 check inter 5s rise 2 fall 5 maxconn 200 |
1493 | 179 | 163 | ||
1494 | 180 | backend backend-site8-local-2 | 164 | backend backend-site8-local-2 |
1495 | 165 | option httpchk HEAD / HTTP/1.0\r\nHost:\ auth.site8.local\r\nUser-Agent:\ haproxy/httpchk | ||
1496 | 181 | http-request set-header Host auth.site8.local | 166 | http-request set-header Host auth.site8.local |
1497 | 182 | http-check send hdr Host auth.site8.local | ||
1498 | 183 | http-check send hdr User-Agent haproxy/httpchk | ||
1499 | 184 | option httpchk HEAD / HTTP/1.0 | ||
1500 | 185 | balance leastconn | 167 | balance leastconn |
1501 | 186 | 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 | 168 | 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 |
1502 | 187 | 169 | ||
1503 | 188 | backend backend-site9-local | 170 | backend backend-site9-local |
1504 | 171 | option httpchk HEAD / HTTP/1.0\r\nHost:\ site9.local\r\nUser-Agent:\ haproxy/httpchk | ||
1505 | 189 | http-request set-header Host site9.local | 172 | http-request set-header Host site9.local |
1506 | 190 | http-check send hdr Host site9.local | ||
1507 | 191 | http-check send hdr User-Agent haproxy/httpchk | ||
1508 | 192 | option httpchk HEAD / HTTP/1.0 | ||
1509 | 193 | balance leastconn | 173 | balance leastconn |
1510 | 194 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 | 174 | server server_1 127.0.1.15:80 check inter 1m rise 2 fall 5 maxconn 200 |
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.