add jobs.pyfound.org to loadbalancer

python · Jan 25, 2023 · bb9a911 · bb9a911
1 parent 24f6a26
commit bb9a911
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 3 deletions.
diff --git a/pillar/base/haproxy.sls b/pillar/base/haproxy.sls
@@ -50,6 +50,13 @@ haproxy:
       check: "GET /test/rev/ea32503c754c HTTP/1.1\\r\\nHost:\\ hg.python.org"
       verify_host: hg.psf.io
 
+    jobs:
+      domains:
+        - jobs.pyfound.org
+      check: False
+      ca-file: "ca-certificates.crt"
+      verify_host: pythonsoftwarefoundation.applytojob.com
+
     pypa-bootstrap:
       domains:
         - bootstrap.pypa.io

diff --git a/pillar/dev/secrets/tls/certs/loadbalancer.sls b/pillar/dev/secrets/tls/certs/loadbalancer.sls
@@ -102,6 +102,56 @@ tls:
       YLxxZ6CalQ4dVAPOYmjmgQ26jetwMGpL53PqXLBd8Yfoi1gr
       -----END CERTIFICATE-----
 
+    star.pyfound.org: |
+      -----BEGIN PRIVATE KEY-----
+      MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCufZjZfjZTAEL+
+      X7nWz0haEhSNT9WKYRVa1U1BnEgZlUnXcXNXKKNQU5QWZaSk/uR/HYG1eX37bxpJ
+      Kwh2bNcPHMuNIzfRZ/xhl8ce1vNwu+3MCeUf+3KliNOKQQlron2bALZsJ0ewDrd/
+      KT+0N+EorCG8Nl1o4g1L48ndQDe8RdFp5ddsBVXpB7vxmh+joffQY5+bH7fFrJ4g
+      qCW6+SG7+6OS+glukck6pb2mTmtexEL6zl+vnvK5L1ex2alM8Z0c6vZNZZWHjOQi
+      wFekCsl0XNZ4r9hqJ4P78Ff4WwVztV6CI7MKpIL1NrLRIMS+qdR12UTV2RFaB8Df
+      /fIQHodjAgMBAAECggEALa4Zxs6A4EfQQhHDcBYB5fqXwMrmp3x0/7uZpxSH15K6
+      qxk7TdUItC29NgPUD5HfNdv+qgitT5atdfw7Ee26e21ZaJCQu1SSwOXgLhWt05SP
+      U3w/rJjCUc25O5d9JN18LokIONYrsU6ZAURGNiLu4hv2FPTSjXOocXan0TFPpgze
+      AuoSmHI8OckIg1DlEQ1SQwtBF1Zt/iUmpr7C/IFInGiPtYDlp1haX82vWEFEbB/o
+      IOOto+sdLgK82XG/C0p3TNFC0fs+ZV39CnvYiho1N6vEVtzMqHDFh28yJtJMMRLl
+      9MfwTZ1EALfKtydnLmU8iOklXrzuejiAmfr2eQjgKQKBgQDnPRWQvSh3UESBC4Ka
+      QOWg2qL3bN9XD+XRhdGgbN0RJFCwlJABTvk+aRPCWMh/LIm3ofbOdQdfBM0t4F8V
+      rx9cpFznmCewv73Isc6a0oMNLkg/u34PfLd7AUrglQa+GHuzoEBv5K9vaHOJKTqj
+      DgpVXpQRTptLmFDev1wiw7Q2vQKBgQDBLOMN11TDzFsMCqRt8g+vECuE8Xw8ad8E
+      43PSeQDoJWo4VLGEGT1KGpPy8qzAgGjx5vuMhRTeCg+qxyjU/CT3FcjG7yoLB2WM
+      vpCtDDfnN+A3Q9Ml4cNTHltBX6blcGWYNL7p1nMa5ChpCopCAwpgdLITZ7GZ5sse
+      bljmHN8onwKBgE8qfYiZChKXG2zmqObwku0YDTUSRABFhBPQca0vuBuXSDy8D/Uy
+      uWghh09BIBtR/zAsNhgGvuhL94beSw9cbitEZj4vvF7ptirQnQAqVA2eK8QOB6F7
+      vEFTdvQecTmBnlAn7AeizmEg7HUn9Vg/hVAm2iB2vfoKgp1P/FY2lCstAoGAfh70
+      TwEbkopFl2MLX8z+eGmyQCX52ue0d9iYsf3Wnbpv0z9YdsqTvWIE3kWajERKQEVy
+      TphEu4MOH43QFt5YtAlBAMD9Th4SKwXwJ0sm5IsSlIJvxPfVMttK8S+mI35yliE5
+      1CnzFMeJqqr7AYZCrB8EdK7qwXRxgPjCidqnyDkCgYEAlHeIAnzKc0xqEBvT4sgR
+      88q/tpSkaFzEz/zy+GhWJ++Fcm4ZYGR8gatx9xA6cydp/+dn2oDAhO0c2WS5hf31
+      LAf8zgummZcylTuZTs6BD7TL409/5QJR4vhzFHremfG0YzAiaRBNVnhyIwQgs11e
+      WefW+UEXxwURvDqAb+PWodY=
+      -----END PRIVATE KEY-----
+      -----BEGIN CERTIFICATE-----
+      MIIDUDCCAjgCCQCRyxZmH+gqmTANBgkqhkiG9w0BAQsFADBqMQswCQYDVQQGEwJV
+      UzELMAkGA1UECAwCTkgxEjAQBgNVBAcMCVdvbGZlYm9ybzEjMCEGA1UECgwaUHl0
+      aG9uIFNvZnR3YXJlIEZvdW5kYXRpb24xFTATBgNVBAMMDCoucHl0aG9uLm9yZzAe
+      Fw0xNDEwMTAyMTA3MzFaFw0yNDEwMDcyMTA3MzFaMGoxCzAJBgNVBAYTAlVTMQsw
+      CQYDVQQIDAJOSDESMBAGA1UEBwwJV29sZmVib3JvMSMwIQYDVQQKDBpQeXRob24g
+      U29mdHdhcmUgRm91bmRhdGlvbjEVMBMGA1UEAwwMKi5weXRob24ub3JnMIIBIjAN
+      BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArn2Y2X42UwBC/l+51s9IWhIUjU/V
+      imEVWtVNQZxIGZVJ13FzVyijUFOUFmWkpP7kfx2BtXl9+28aSSsIdmzXDxzLjSM3
+      0Wf8YZfHHtbzcLvtzAnlH/typYjTikEJa6J9mwC2bCdHsA63fyk/tDfhKKwhvDZd
+      aOINS+PJ3UA3vEXRaeXXbAVV6Qe78Zofo6H30GOfmx+3xayeIKgluvkhu/ujkvoJ
+      bpHJOqW9pk5rXsRC+s5fr57yuS9XsdmpTPGdHOr2TWWVh4zkIsBXpArJdFzWeK/Y
+      aieD+/BX+FsFc7VegiOzCqSC9Tay0SDEvqnUddlE1dkRWgfA3/3yEB6HYwIDAQAB
+      MA0GCSqGSIb3DQEBCwUAA4IBAQAJ+NsXFG1ik2wds9D0AuIBw9lxPHq4xPzdPPna
+      X3hZFAtx25EB7PEZwkaPUkYbtv5qiE+B9cA0nLeR5ZueINP5ACCWpR8ku8meFulj
+      AIMpw+juR8eAYIA33h607B7wUMvUGaTssvKRlqx9Jp3oQbV2FGQDoJ5QihTXQSV/
+      6UwzfdzSPA82pCMdDGbXmcNMoQaUQH456SSEsQZBx2pYmHTVK2xSxG+MYh5neIFK
+      HPZLJpVwmkcOBtQ8YaXpc43vWlMZhxDjth5eaQgIo0+j5ItJ4N6/noR9wLjhdgvk
+      YLxxZ6CalQ4dVAPOYmjmgQ26jetwMGpL53PqXLBd8Yfoi1gr
+      -----END CERTIFICATE-----
+
     speed.pypy.org: |
       -----BEGIN PRIVATE KEY-----
       MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCufZjZfjZTAEL+

diff --git a/pillar/prod/consul.sls b/pillar/prod/consul.sls
@@ -21,3 +21,8 @@ consul:
       address: www.pythonanywhere.com
       service: console
       port: 443
+    - datacenter: nyc1
+      node: jobspyfound
+      address: pythonsoftwarefoundation.applytojob.com
+      service: jobs
+      port: 443
diff --git a/salt/haproxy/config/haproxy.cfg.jinja b/salt/haproxy/config/haproxy.cfg.jinja
@@ -87,9 +87,9 @@ listen tls:
     bind :20007 ssl alpn h2,http/1.1 crt www.pycon.org.pem
     bind :20008 ssl alpn h2,http/1.1 crt jython.org.pem
     bind :20009 ssl alpn h2,http/1.1 crt pypy.org.pem
-    bind 0.0.0.0:443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem
-    bind :::443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem
-    bind :20010 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem
+    bind 0.0.0.0:443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem
+    bind :::443 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pemt  crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem
+    bind :20010 ssl alpn h2,http/1.1 crt star.python.org.pem crt star.pypa.io.pem crt star.pyfound.org.pem crt speed.pypy.org.pem crt www.pycon.org.pem crt jython.org.pem crt pypy.org.pem
 
     mode http