From 0a4753676c4b2ef07a5f37c3819de6f9514a60ac Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Mon, 24 Jun 2024 16:01:52 -0400 Subject: [PATCH] remove the bootstrap.pypa.io server superceded by https://github.com/pypa/bootstrap --- Vagrantfile | 1 - pillar/base/haproxy.sls | 6 - pillar/base/tls.sls | 4 - pillar/dev/roles.sls | 5 - pillar/dev/top.sls | 4 - pillar/prod/roles.sls | 6 - pillar/prod/top.sls | 4 - salt/pypa/bootstrap/config/nginx.conf.jinja | 20 --- salt/pypa/bootstrap/init.sls | 189 -------------------- salt/top.sls | 4 - 10 files changed, 243 deletions(-) delete mode 100644 salt/pypa/bootstrap/config/nginx.conf.jinja delete mode 100644 salt/pypa/bootstrap/init.sls diff --git a/Vagrantfile b/Vagrantfile index 544c8b97..e570201c 100644 --- 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 index 21da7c27..29f77297 100644 --- 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 index 637983ea..0a6760b0 100644 --- 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 index 591c117c..cd359839 100644 --- 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 index 75a0f006..b7d8f454 100644 --- 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 index 697cb186..133257b9 100644 --- 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 index fd73c9b4..ed49f2ed 100644 --- 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 deleted file mode 100644 index 8def9253..00000000 --- a/salt/pypa/bootstrap/config/nginx.conf.jinja +++ /dev/null @@ -1,20 +0,0 @@ -server { - listen 9000 ssl; - server_name bootstrap.pypa.io; - - ssl_certificate /etc/ssl/private/bootstrap.pypa.psf.io.pem; - ssl_certificate_key /etc/ssl/private/bootstrap.pypa.psf.io.pem; - - include fastly_params; - - error_log /var/log/nginx/bootstrap.error.log; - access_log /var/log/nginx/bootstrap.access.log; - - root /srv/bootstrap/www; - - types { - text/x-python py; - } - - autoindex on; -} diff --git a/salt/pypa/bootstrap/init.sls b/salt/pypa/bootstrap/init.sls deleted file mode 100644 index 204bcf03..00000000 --- a/salt/pypa/bootstrap/init.sls +++ /dev/null @@ -1,189 +0,0 @@ - -include: - - nginx - - -bootrap-deps: - pkg.installed: - - pkgs: - - git - - curl - - -/srv/bootstrap/www: - file.directory: - - user: nginx - - group: nginx - - mode: "0755" - - makedirs: True - - -/etc/nginx/sites.d/bootstrap.pypa.io.conf: - file.managed: - - source: salt://pypa/bootstrap/config/nginx.conf.jinja - - template: jinja - - require: - - file: /etc/nginx/sites.d/ - - file: /srv/bootstrap/www - - -pip-clone: - git.latest: - - name: https://github.com/pypa/get-pip.git - - target: /srv/bootstrap/pip - - user: nginx - - force_clone: True - - force_reset: True - - force_checkout: True - - require: - - pkg: bootrap-deps - - -setuptools-clone: - git.latest: - - name: https://github.com/pypa/setuptools - - rev: bootstrap - - target: /srv/bootstrap/setuptools - - user: nginx - - force_clone: True - - force_reset: True - - force_checkout: True - - require: - - pkg: bootrap-deps - - -buildout-clone: - git.latest: - - name: https://github.com/buildout/buildout.git - - rev: bootstrap-release - - target: /srv/bootstrap/buildout - - user: nginx - - force_clone: True - - force_reset: True - - force_checkout: True - - require: - - pkg: bootrap-deps - -virtualenv-clone: - git.latest: - - name: https://github.com/pypa/get-virtualenv.git - - target: /srv/bootstrap/virtualenv - - user: nginx - - force_clone: True - - force_reset: True - - force_checkout: True - - require: - - pkg: bootrap-deps - - -/srv/bootstrap/www/pip: - file.symlink: - - target: /srv/bootstrap/pip/public - - require: - - git: pip-clone - - -/srv/bootstrap/www/get-pip.py: - file.symlink: - - target: /srv/bootstrap/pip/public/get-pip.py - - require: - - git: pip-clone - -/srv/bootstrap/www/ez_setup.py: - file.symlink: - - target: /srv/bootstrap/setuptools/ez_setup.py - - require: - - git: setuptools-clone - - -/srv/bootstrap/www/bootstrap-buildout.py: - file.symlink: - - target: /srv/bootstrap/buildout/bootstrap/bootstrap.py - - require: - - git: buildout-clone - -/srv/bootstrap/www/virtualenv: - file.symlink: - - target: /srv/bootstrap/virtualenv/public - - require: - - git: virtualenv-clone - -/srv/bootstrap/www/virtualenv.pyz: - file.symlink: - - target: /srv/bootstrap/virtualenv/public/virtualenv.pyz - - require: - - git: virtualenv-clone - -refresh-pip: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/get-pip.py' - - require: - - file: /srv/bootstrap/www/get-pip.py - - onchanges: - - git: pip-clone - -purge-pip-index: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/pip/' - - onchanges: - - git: pip-clone - -refresh-setuptools: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/ez_setup.py' - - require: - - file: /srv/bootstrap/www/ez_setup.py - - onchanges: - - git: setuptools-clone - -refresh-buildout: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/bootstrap-buildout.py' - - require: - - file: /srv/bootstrap/www/bootstrap-buildout.py - - onchanges: - - git: buildout-clone - -refresh-virtualenv: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/virtualenv.pyz' - - require: - - file: /srv/bootstrap/www/virtualenv.pyz - - onchanges: - - git: virtualenv-clone - -refresh-virtualenv-files: - cmd.run: - - name: "find /srv/bootstrap/virtualenv/public -type l,f -printf '%P\n' | xargs -I{} curl -s -X PURGE https://bootstrap.pypa.io/virtualenv/{}" - - require: - - file: /srv/bootstrap/www/virtualenv.pyz - - onchanges: - - git: virtualenv-clone - -purge-virutualenv-index: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/virtualenv/' - - onchanges: - - git: virtualenv-clone - -purge-index: - cmd.run: - - name: 'curl -s -X PURGE https://bootstrap.pypa.io/' - - onchanges: - - git: pip-clone - - git: setuptools-clone - - git: buildout-clone - - git: virtualenv-clone - -/etc/consul.d/service-pypa-bootstrap.json: - file.managed: - - source: salt://consul/etc/service.jinja - - template: jinja - - context: - name: pypa-bootstrap - port: 9000 - - user: root - - group: root - - mode: "0644" - - require: - - pkg: consul-pkgs diff --git a/salt/top.sls b/salt/top.sls index 7dd11866..2cb083ce 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -89,7 +89,3 @@ base: - postgresql.admin - dns - tls.pebble - - 'web-pypa': - - match: nodegroup - - pypa.bootstrap