properly fixup jobs.pyfound.org via SNI support

python · Aug 30, 2023 · 557c13b · 557c13b
1 parent 3cc4a41
commit 557c13b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pillar/base/haproxy.sls b/pillar/base/haproxy.sls
@@ -53,9 +53,10 @@ haproxy:
     jobs:
       domains:
         - jobs.pyfound.org
-      check: False
+      check: "GET / HTTP/1.1\\r\\nHost:\\ pythonsoftwarefoundation.applytojob.com"
       ca-file: "ca-certificates.crt"
       verify_host: pythonsoftwarefoundation.applytojob.com
+      sni: pythonsoftwarefoundation.applytojob.com
       extra:
         - http-request replace-header Host ^.*$ pythonsoftwarefoundation.applytojob.com
 

diff --git a/salt/haproxy/config/haproxy.cfg.jinja b/salt/haproxy/config/haproxy.cfg.jinja
@@ -223,7 +223,7 @@ backend {{ service }}
     {% endfor -%}
 
     {{ "{{" }}range service "{{ service }}@{{ pillar.dc }}" "any"}}
-    {% raw %}server {{.Node}} {{.Address}}:{{.Port}}{% endraw %}{% if config.get("check", True) %} check{% endif %}{% if config.get("tls", True) %} ssl force-tlsv12 verifyhost {{ config.get("verify_host", service + ".psf.io") }} ca-file {{ config.get("ca-file", "PSF_CA.pem") }}{% endif %}{{ "{{end}}" }}
+    {% raw %}server {{.Node}} {{.Address}}:{{.Port}}{% endraw %}{% if config.get("check", True) %} check{% if config.get("sni", False)%} check-sni {{ config.get("sni") }}{% endif %}{% if config.get("sni", False)%} sni str({{ config.get("sni") }}){% endif %}{% endif %}{% if config.get("tls", True) %} ssl force-tlsv12 verifyhost {{ config.get("verify_host", service + ".psf.io") }} ca-file {{ config.get("ca-file", "PSF_CA.pem") }}{% endif %}{{ "{{end}}" }}
 
 {% endfor %}