remove the bootstrap.pypa.io server (#358)

superceded by https://github.com/pypa/bootstrap
python · Jun 24, 2024 · 1a2d520 · 1a2d520
1 parent 7d95a6c
commit 1a2d520
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 243 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -17,7 +17,6 @@ SERVERS = [
   "planet",
   "pypy-web",
   "pythontest",
-  "web-pypa",
 ]
 
 SUBNET1 = "192.168.50"

diff --git a/pillar/base/haproxy.sls b/pillar/base/haproxy.sls
@@ -60,12 +60,6 @@ haproxy:
       extra:
         - http-request replace-header Host ^.*$ pythonsoftwarefoundation.applytojob.com
 
-    pypa-bootstrap:
-      domains:
-        - bootstrap.pypa.io
-      verify_host: bootstrap.pypa.psf.io
-      check: "HEAD / HTTP/1.1\\r\\nHost:\\ bootstrap.pypa.io"
-
     pypy-web:
       domains:
         - www.pypy.org

diff --git a/pillar/base/tls.sls b/pillar/base/tls.sls
@@ -6,10 +6,6 @@ tls:
     default: ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES256:ECDH+AES128:!aNULL:!SHA1:!AESCCM
 
   gen_certs:
-    bootstrap.pypa.psf.io:
-      roles:
-        - web-pypa
-
     buildbot-master.psf.io:
       roles:
         - buildbot

diff --git a/pillar/dev/roles.sls b/pillar/dev/roles.sls
@@ -90,8 +90,3 @@ roles:
     pattern: "moin.vagrant.psf.io"
     purpose: ""
     contact: ""
-
-  web-pypa:
-    pattern: "web-pypa.vagrant.psf.io"
-    purpose: ""
-    contact: ""
diff --git a/pillar/dev/top.sls b/pillar/dev/top.sls
@@ -81,10 +81,6 @@ base:
     - match: nodegroup
     - secrets.postgresql-users.tracker
 
-  'web-pypa':
-    - match: nodegroup
-    - firewall.rs-lb-backend
-
   'wiki':
     - match: nodegroup
     - moin

diff --git a/pillar/prod/roles.sls b/pillar/prod/roles.sls
@@ -74,9 +74,3 @@ roles:
     pattern:  "moin*.nyc1.psf.io"
     purpose:  "Hosts moin sites for wiki.python.org, wiki.jython.org"
     contact:  "lemburg"
-
-  # Misc PyPA
-  web-pypa:
-    pattern:  "web*.pypa.nyc1.psf.io"
-    purpose:  "Python Packaging Authority"
-    contact:  "dstufft"
diff --git a/pillar/prod/top.sls b/pillar/prod/top.sls
@@ -111,10 +111,6 @@ base:
     - firewall.ftp
     - firewall.snakebite
 
-  'web-pypa':
-    - match: nodegroup
-    - firewall.rs-lb-backend
-
   'salt-master':
     - match: nodegroup
     - firewall.salt

diff --git a/salt/pypa/bootstrap/config/nginx.conf.jinja b/salt/pypa/bootstrap/config/nginx.conf.jinja
diff --git a/salt/pypa/bootstrap/init.sls b/salt/pypa/bootstrap/init.sls
diff --git a/salt/top.sls b/salt/top.sls
@@ -89,7 +89,3 @@ base:
     - postgresql.admin
     - dns
     - tls.pebble
-
-  'web-pypa':
-    - match: nodegroup
-    - pypa.bootstrap