Cleanup! (#265)

* remove aptly/packages role and document packagecloud.io usage * remove pydotorg hosting bits, this is on heroku now * remove hosting configuration for us.pycon.org, moved to heroku * remove deprecated speed-web configuration, superseded by codespeed role closes #183 * remove unused discourse configs, hosted with discourse.org now * remove unused slack role * remove jython-web configuration, hosted as static dir on S3 now * remove unused config for monitoring (via graphite, we use datadog now)
python · Jul 28, 2022 · 25c44e7 · 25c44e7
1 parent a73da76
commit 25c44e7
Show file tree

Hide file tree

Showing 55 changed files with 13 additions and 2,559 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -11,7 +11,6 @@ SERVERS = [
   "docs",
   "downloads",
   "hg",
-  "jython-web",
   {:name => "loadbalancer", :ports => [20000, 20001, 20002, 20003, 20004, 20005, 20100]},
   "mail",
   "moin",

diff --git a/docs/packages.rst b/docs/packages.rst
@@ -1,11 +1,15 @@
 APT Packages
 ============
 
-PSF Infrastructure has the ability to create apt repositories stored on S3.
-The primary one of these is named "psf" and it is located at
-``http://apt.psf.io/psf/``. The psf repository has been added to all servers by
-default and can be used to ship things which are not available in Ubuntu or a
-ppa or for which there are patched versions required.
+PSF Infrastructure utilizes an apt repository for serving additional debian
+packages or versions not available from our upstream distributions.
+
+This repository is hosted on `packagecloud <https://packagecloud.io>`_ at
+`https://packagecloud.io/psf/infra <https://packagecloud.io/psf/infra>`_.
+
+The psf/infra repository has been added to all servers by default and can be
+used to ship things which are not available in Ubuntu or a ppa or for which
+there are patched versions required.
 
 
 Install from the PSF repository
@@ -19,29 +23,7 @@ should pick up the package automatically.
 Uploading to the PSF repository
 -------------------------------
 
-In order to upload to the PSF repository you must be a member of the
-``aptly-uploaders`` group. You can add yourself to this group by simply editing
-``pillar/users.sls`` and adding:
-
-.. code-block:: yaml
-
-    access:
-      packages:
-        groups:
-          - aptly-uploaders
-
-below your user account.
-
-
-After you're a member of that ``aptly-uploaders`` group, you can upload a
-``.deb`` or a ``.dsc`` file by simplying placing it in the
-``/srv/aptly/incoming/psf-trusty/`` or ``/srv/aptly/incoming/psf-precise/``
-directory on the packages.psf.io server depending on if the package is for
-trusty or precise. For example:
-
-.. code-block:: console
-
-    $ scp python-wal-e_0.7.2-2_all.deb packages.psf.io:/srv/aptly/incoming/psf-trusty/
-
-Every 5 minutes ``packages.psf.io`` will scan this directory for new files,
-process them and then they will be available in the PSF repository.
+Access to the packagecloud repository is managed by the PSF Infrastructure
+Team. Packages can be uploaded by providing them to the team, or if a
+contributor consistently contributes to this repository, they may create a user
+with packagecloud.io and have their user added to the team.
diff --git a/pillar/base/firewall/discourse.sls b/pillar/base/firewall/discourse.sls
diff --git a/pillar/base/firewall/monitoring.sls b/pillar/base/firewall/monitoring.sls
diff --git a/pillar/base/groups/jython.sls b/pillar/base/groups/jython.sls
diff --git a/pillar/base/pycon/prod.sls b/pillar/base/pycon/prod.sls
diff --git a/pillar/base/pycon/staging.sls b/pillar/base/pycon/staging.sls
diff --git a/pillar/base/pydotorg/prod.sls b/pillar/base/pydotorg/prod.sls
diff --git a/pillar/base/pydotorg/staging.sls b/pillar/base/pydotorg/staging.sls
diff --git a/pillar/base/pydotorg/staging2.sls b/pillar/base/pydotorg/staging2.sls
diff --git a/pillar/base/users.sls b/pillar/base/users.sls
@@ -26,10 +26,6 @@ users:
     ssh_keys:
       - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG7R8y2Ecocj+t5rP7YNmNWM+QmmZ8Wuz0f1btJ3KcA0 donald@stufft.io
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5md5DAPib7J+uGHanzgQOJ9GwGYAi7RLbG+rB/0NRk8UbUnwzn0JwkqNTXzeomUapO5Z3cOxQ98jzb0k03hGOzhzjIQpaKI1uKxPPquDevf/PwM5ZQaJzlx/8ah76GzJtEQpIIIbw/fofzywv9pZKTBCDL3wBHB94oByQjr0BG9CfjbMZq6FXcBKfo89L56nLQ8cdvxg2tjNJQElva5gL/xnqjpowtQYjA9MPKFmDwJPcrRF2AstBg5Zpkg+8K4JhJltucXTPEva97alK9prshGFY6XLtVD0mtgbwpHFXjFm7cIQYr8XG3pJdtWki0fLg0o3W1YBukQ+reDblT8SnFaDscgF1gStTra5zXfVF5OJaaRFE8zaYuwC01DQT9sN9G4fV4eK8HRbgpObCJcxnCyTs/SYGVhO1PpOiQYmyswGUlV4vU8G3gl3u0D+gkcpHRkdko0HlFbNUt1wKIZWcGLJcKkNWMKGSf1TaciU+6+2A4QVDxtdab8HdjnbuugX9/FckqjZypaUOwl8U4fYc4JbdUQ78PvcQrSQvhRPZB+1KSvm8rwRuBnFWiNlYmThLhGmKDBXegNF8eFRe4dApzv2DyshasHs4tNv46YIox6FdFEw0voRNPqhbTCF3XIdOQvxkHeZRyGGWv4WCTImM5+3GhXrbOQUtB9NjfM7rhQ== donald@stufft.io
-    access:
-      packages:
-        groups:
-          - aptly-uploaders
 
   benjaminws:
     fullname: "Benjamin W. Smith"
@@ -59,9 +55,6 @@ users:
       downloads:
         groups:
           - downloads
-      jython-web:
-        groups:
-          - jython
 
   # Other users
   antoine:
@@ -94,16 +87,6 @@ users:
         allowed: True
         sudo: True
 
-  fwierzbicki:
-    fullname: "Frank Wierzbicki"
-    ssh_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAscNf5qrUYYXPjSJAjDPeZIwmxHJKf10sjBSoRXoD6nBfCoN+joPZIX+xxPZWqunFKcRxcaQCtxAOYLWDy2s4AfIe1oGv2gPZsrYOs3FrlSYSnvOgfbQzmqs1p7Jm5Rxwh/TKRonh8iYt8YD04z6oQ1/p1WkazsVXD/dekX0vC5PzMRMIpq3oUTJ1BaWbFQmh580r6J9mAgavxwuaOrDT/Ld73kvYwdFFbIuK1LRcYdQvuJDK8+y9qTk5shb8FtmAPLCwQV9S4OwItoZVUp29rCQgmPH3dOY1GB2EM2lus7mRRc4e371kIGKC5/jCLSeA0Jc4mATDvxSx45sSmygutw==
-    access:
-      jython-web:
-        allowed: True
-        groups:
-          - jython
-
   gbrandl:
     fullname: "Georg Brandl"
     ssh_keys:
@@ -123,16 +106,6 @@ users:
         allowed: True
         sudo: True
 
-  gronholm:
-    fullname: "Alex Gronholmn"
-    ssh_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAoAooLyA81RQSzJKuQ3r7XwFOFpuCQACW5pM7qrNDkwSJALxIFn/TIecGc94AecRyhQfzQThJVNGm7x4+W92tDb+LY8EGO+LiizgHwMFSF9SOosHLiuAklC/OFy7xAnfwEJbW41ZALsW+K84tDv4WseO2iKCqhwP+9Wi6ToV+9Nk=
-    access:
-      jython-web:
-        allowed: True
-        groups:
-          - jython
-
   larry:
     fullname: "Larry Hastings"
     ssh_keys:
@@ -181,16 +154,6 @@ users:
           - docs
           - docsbuild
 
-  pjenvey:
-    fullname: "Philip Jenvey"
-    ssh_keys:
-      - ssh-dss AAAAB3NzaC1kc3MAAAEBAIZHS9XNndCJaMiUhkqqMecbLMa2MQg8wAq9ekncy06WEiHxNJwgUYtObrtZQFxlXpwad1q/6p9KQBkGlneUaAdFNoEqEwCex4INiqhrjzKAyRs42zy5i2bh8blFMGN/0LejJihABC7eBE42DWNBdbkUXqJLVPJX5rMduR8qCHMyyD/y+2MmsQGIORjYNTnV+E5lb20WfC7RrFA1+rImPdmI5gyXafHtfPewRWk4wBg+CjIDJ7ci4mqLaTrXAgOjoJwBn5hWGdFq7jTlThEt38riXYK/EiX+lx3Ncj5GFaqk9Try9A0dgSp2ifBlNUn8Qkh4qpmDeRectveFJK04o7cAAAAVAMgyHCzNfUfrzyeIqVVz+vcbC9FZAAABADpjkVMORDKgmC9wPwIlXxEuU3T6Srsnc8Pn90lAlNhBCNEVFlWBnSilK1jRrB/o5PFVFDAao51LsPRfPaSAmIYp//CowQHtTFo6qDzH1YLYvUUy/YRiXeFhHabFonr6CfAasYzbnkI5fUBwgNv9ZrnjnmG1P4WgWoIhpEKUhXssWmoev40182YDNXe3dEkbSUqWBjqniPUVaUsyPYb7PAmzm5sAjJgZtGz98KioAgTxEoTwCb9lkyBP9TWkoJzYRMoM9vheDwFRRGn2yRRYUG3JU5nSP4AAD+vRbBn/dSJJSOJ+RWOmvRGcEYuop+0/NAQ2RUuzyGlxcjsa9NLnSHgAAAEATPC5OAnez+kwqxJbbxA+OaYkODFoBMjq9Gwwz1/wjMRKvqjzJFwkmSlQtOLPFpr111HZzk7Z6LAJ/cxDLW9AB6ACHGoTpb5gT0YF8vhhpiOIbh525e1fbhW1iBir4PYmC1C4Yn5vzGH/Xtt5l7d5UvEyndtKrjKl6CAvio/v5Oc1nVZvZEEMzdxp5UyVTmrSpKhXmbfkr3B6kh6RF6esvBx/5o3RDWVJYj4MooBjfj6VRvuDtufKTeRe5sptP2eUPu0kjQ9GGxfCf7AXqDJRE//ziLaewdVy1o5jxu+RvHzQh7mk9lzNgcwr0cvMD0hVfEkQk9hrGIIZs/vJAIZlWQ==
-    access:
-      jython-web:
-        allowed: True
-        groups:
-          - jython
-
   sdower:
     fullname: "Steve Dower"
     ssh_keys:
@@ -202,15 +165,6 @@ users:
         groups:
           - downloads
 
-  frank:
-    fullname: "Frank Wiles"
-    ssh_keys:
-      - ssh-dss AAAAB3NzaC1kc3MAAACBAN3K472pNxIi1LIz6VeFYVmsRDhj5Kx7xKpoKVNUBXKZastMQ7rhI/KeRVshhR+q4apR4EbKE9qsyO2632RYzC5W8lc6YKs/lShMBDe2knnyQsaLLguOsrn8+1PusdxPPW91XCINTrKyr3Nwsh5dck8OvzJ9ahCIW0RlZiV3dyM7AAAAFQC/4DxBpn/7d2QVFjf2jL6y3AtgeQAAAIEAva/IdhMV7inBKd1aMBCNdul59eAuZImjAgAY6HNJoh7iFHHx/jZRc9vhk8YfWV0Bu9MIECVN8rbdwrYCvmkDhreTYZ4dLntO7qtHgjeIEX2qZbz+WihmcF8G2XubShJSX1eGsbgl4cNPWbTBf/EzLf++RdfIqSMWuZO6/LQxL8oAAACBALSbnQv/5eQf3hGzXb91tDutWLjx/QvR7UXmJjgvAhSdAbvACLE+hF30XXYXwlwAycPn1G/cYZThMlVZnHZXKscErir0vNKFR922vjfjsTZ2QfNL5RCpggzeMMT8J6s4Mo936vut8nsWUJ69Bwz2Ib4/GPE2NcmAb6iuht2HmqaI
-    access:
-      pydotorg:
-        allowed: True
-        sudo: True
-
   brian:
     fullname: "Brian Curtin"
     ssh_keys:
@@ -329,16 +283,6 @@ users:
           - docs
           - docsbuild
 
-  berker:
-    fullname: "Berker Peksag"
-    ssh_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdJMNdov7ZzE6LZcYucb1dUUGaiRcBrqvJpQEgsqh50dSFawxRmjGtT2L7qcpYC/wxlUkTuUQpw8SepViIQuTQhIemyHfUUM0CjNTbEXE+lnVg2Re5V7ShsfY8RE3UVjbN3IkJW47dpASt5on7Llqa6eS3/IFdHa3pRTf35SdlsaF/t5nXXSwnFzUVY/lbv6gYB1Tgy9Pbi35MvlAS1AFstTFTz5LylimGfo7dNIQHAQHQc5M0zqcspvcPlUzIAgm8RYSp8L6kQ5jOagnPtCEGAcOHKRX0427l3GxfYhziGoBjvRU0iwuOtzloepAHXvgZJk1/1KycvSRRcFtAoWYd berker.peksag@gmail.com
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPoCBV+yjow9tlIRQ/EbhAdBeuaqXgdVsaGTfsY4kDFfBfiaDITmzJk220/HuHHyLYuHAcDNqwS0f1GCURJv3PPaoLYpMyeA/VlPldyl8+vjkL5lNPbSDyOIEw+t4I2qDkry59xosHzQwuB+6VEgPU3tBpj/gCXyekwNCjTaY+6FaRF3/zLUpuv84AXBR2vaZ4pJBFrp5OMZxOzqSA1nnqieSoDGfArl8GsGHHlykTaDI2cVtHq2wnMjU4lG4lRACVITiNo1Oq3uLYgRnxSbOi4fHmYvG3fdDDz/JYgN52RXA1cA90pZua03VR9UErbDIzAk4CiPx7urpL1xYMwP59aDkbpqgJNCWyn0kAlNTyaVH19kvEtlGI1KMYJrREuwzwZx23cM95Fl7aJyrOm6C14y7QBvjS4MxepIOhayOu9BFntTYczqT2W/zrfDBDz9wFSsPNHRyHw1ouUWCD8j4DZCcVm2SAopLc3qbK+J9otBWTlJaBlkEUsHA9KWolB0ygSxQeOSOnQ8WACOmRr4HtG641WTwfUWTZLd3VtPFOSH3MnWKHelNCK7vOze2H2pF3i+uiNthCFyMYs5/eWHasjq17aMg8qkbZhcLRurqYWXg0G07bRQULbmd3xearvKKqwPMlFxLypR4YjUUwc6Um/PnMQnz7qhoGLqtFuA7o7Q== berker.peksag@gmail.com
-    access:
-      pydotorg:
-        allowed: True
-        sudo: True
-
   maxking:
     fullname: "Abhilash Raj"
     ssh_keys:

diff --git a/pillar/dev/aptly/packages.sls b/pillar/dev/aptly/packages.sls
diff --git a/pillar/dev/secrets/aptly.sls b/pillar/dev/secrets/aptly.sls
diff --git a/pillar/dev/secrets/speed-web.sls b/pillar/dev/secrets/speed-web.sls