Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove the bootstrap.pypa.io server #358

Merged
merged 1 commit into from
Jun 24, 2024
Merged

remove the bootstrap.pypa.io server #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ SERVERS = [
"planet",
"pypy-web",
"pythontest",
"web-pypa",
]

SUBNET1 = "192.168.50"
Expand Down
6 changes: 0 additions & 6 deletions pillar/base/haproxy.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions pillar/base/tls.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions pillar/dev/roles.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,3 @@ roles:
pattern: "moin.vagrant.psf.io"
purpose: ""
contact: ""

web-pypa:
pattern: "web-pypa.vagrant.psf.io"
purpose: ""
contact: ""
4 changes: 0 additions & 4 deletions pillar/dev/top.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ base:
- match: nodegroup
- secrets.postgresql-users.tracker

'web-pypa':
- match: nodegroup
- firewall.rs-lb-backend

'wiki':
- match: nodegroup
- moin
Expand Down
6 changes: 0 additions & 6 deletions pillar/prod/roles.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 0 additions & 4 deletions pillar/prod/top.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ base:
- firewall.ftp
- firewall.snakebite

'web-pypa':
- match: nodegroup
- firewall.rs-lb-backend

'salt-master':
- match: nodegroup
- firewall.salt
Expand Down
20 changes: 0 additions & 20 deletions salt/pypa/bootstrap/config/nginx.conf.jinja
View file
Open in desktop

This file was deleted.

189 changes: 0 additions & 189 deletions salt/pypa/bootstrap/init.sls
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions salt/top.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,3 @@ base:
- postgresql.admin
- dns
- tls.pebble

'web-pypa':
- match: nodegroup
- pypa.bootstrap
Loading