Migrate Moin (wiki.python.org) to static site

Vagrantfile

@@ -13,7 +13,7 @@ SERVERS = [
   {:name => "hg", :codename => "noble"},
   {:name => "loadbalancer", :codename => "noble", :ports => [20000, 20001, 20002, 20004, 20010, 20011]},
   "mail",
-  "moin",
+  {:name => "moin", :codename => "noble"},
   "planet",
   "pythontest",
 ]

docs/guides/migration-recipe.md

@@ -90,24 +90,29 @@ index 68387c9..7a8ace1 100644
     ssh root@NNN.NNN.NNN.NNN
    ```
 2. Add Salt repositories for our current target version (add the apt-repo and install `salt-minion` package):
-    > **Note**: Ensure you are adding the correct key/repository for the version of Ubuntu you are using. 
+    > **Note**: Ensure you are adding the correct key/repository for the version of Ubuntu you are using.
     >
-    > See [the Salt installation guide](https://docs.saltproject.io/salt/install-guide/en/latest/topics/install-by-operating-system/ubuntu.html) for more information.
-    ```console
-    UBUNTU_VERSION=$(lsb_release -rs)
-    ARCH=$(dpkg --print-architecture)
-    CODENAME=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d '=' -f 2)
-
-    echo "Adding the SaltStack repository key for $UBUNTU_VERSION $CODENAME ($ARCH)..."
-    sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2024.gpg https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
-    echo "Adding the SaltStack repository for $UBUNTU_VERSION $CODENAME ($ARCH)..."
-    echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.gpg arch=$ARCH] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" | sudo tee /etc/apt/sources.list.d/salt.list
-    echo "Pinning Salt to v3006.*"
-    RUN printf "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001\n" > /etc/apt/preferences.d/salt-pin-1001
+    > See [the Salt installation guide](https://salt.tips/salt-install-guide/en/latest/topics/install-by-operating-system/linux-deb.html) for more information.
+    ```console
+    # Ensure keyrings dir exists
+    mkdir -m 755 -p /etc/apt/keyrings
+
+    # Download and dearmor the public key
+    curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public \
+      | gpg --dearmor | sudo tee /etc/apt/keyrings/salt-archive-keyring.pgp > /dev/null
+
+    # Create apt repo target configuration (DEB822 format)
+    curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources \
+      | sudo tee /etc/apt/sources.list.d/salt.sources
+
+    # Pin to Salt 3006 LTS
+    echo 'Package: salt-*
+    Pin: version 3006.*
+    Pin-Priority: 1001' | sudo tee /etc/apt/preferences.d/salt-pin-1001
     ```
 3. Install and configure the salt-minion. On `$new-host`, run the command
     ```console
-    apt-get update -y && apt-get install -y --no-install-recommends salt-minion
+    sudo apt-get update -y && sudo apt-get install -y --no-install-recommends salt-minion
     ```
     - On the `old-host`, look through `/etc/salt/minion.d*` to set up salt-minion configuration files to match on new-host:
       - Generate bash that will create these files

pillar/base/haproxy.sls

@@ -84,7 +84,7 @@ haproxy:
         - wiki.jython.org
       verify_host: moin.psf.io
       rate_limit: 50
-      check: "HEAD /moin/HelpContents HTTP/1.1\\r\\nHost:\\ wiki.python.org"
+      check: "HEAD / HTTP/1.1\\r\\nHost:\\ wiki.python.org"
 
     svn:
       domains:

pillar/dev/roles.sls

@@ -83,6 +83,6 @@ roles:
     purpose: ""
     contact: ""
   moin:
-    pattern: "moin.vagrant.psf.io"
-    purpose: ""
+    pattern: "wiki.vagrant.psf.io"
+    purpose: "Static wiki archive"
     contact: ""

pillar/dev/top.sls

@@ -90,5 +90,4 @@ base:
 
   'wiki':
     - match: nodegroup
-    - moin
     - firewall.rs-lb-backend

pillar/prod/roles.sls

@@ -87,7 +87,7 @@ roles:
     contact:  "Infrastructure Staff"
     category: "infra-infra"
   moin:
-    pattern:  "moin*.nyc1.psf.io"
-    purpose:  "Hosts moin sites for wiki.python.org, wiki.jython.org"
-    contact:  "lemburg"
+    pattern:  "wiki*.nyc1.psf.io"
+    purpose:  "Static wiki archive for wiki.python.org, wiki.jython.org"
+    contact:  "Infrastructure Staff"
     category: "community"

pillar/prod/top.sls

@@ -87,7 +87,6 @@ base:
 
   'moin':
     - match: nodegroup
-    - mail-opt-out
     - firewall.rs-lb-backend
     - backup.moin