Merge branch 'main' into #364-docs-previews

Vagrantfile

@@ -4,7 +4,7 @@
 SERVERS = [
   "backup-server",
   {:name => "bugs", :codename => "jammy", :ports => [8080]},
-  "buildbot",
+  {:name => "buildbot", :codename => "noble"},
   "cdn-logs",
   {:name => "codespeed", :codename => "jammy"},
   {:name => "consul", :codename => "jammy"},

docs/guides/migration-recipe.md

@@ -167,7 +167,9 @@ index 68387c9..7a8ace1 100644
     ```
     - The `/pathname/` can be determined by looking at the pillar data for backups, `pillar/prod/backup` using the 
       `source_directory` path for the given host (example: the `downloads` host uses `/srv/`)
-
+    - ```{note}
+      Don't forget to enable SSH forwarding to allow the `rsync` command to use the local SSH key to connect to the old host.
+      ```
 ### Stop services on old host
 
 1.  SSH into `old-host`:

pillar/prod/backup/buildbot.sls

@@ -1,9 +1,9 @@
-#backup:
-#  directories:
-#    python-buildbot-config:
-#      source_directory: /etc/buildbot/
-#      target_host: backup.sfo1.psf.io
-#      target_directory: /backup/buildbot
-#      target_user: buildbot
-#      frequency: hourly
-#      user: root
+backup:
+  directories:
+    python-buildbot-config:
+      source_directory: /etc/buildbot/
+      target_host: backup.sfo1.psf.io
+      target_directory: /backup/buildbot
+      target_user: buildbot
+      frequency: hourly
+      user: root

pillar/prod/backup/hg.sls

@@ -14,3 +14,10 @@ backup:
       target_user: root
       frequency: daily
       user: root
+    hg-svn-config:
+      source_directory: /etc/apache2/svn_config/
+      target_host: backup.sfo1.psf.io
+      target_directory: /backup/hg-svn-config
+      target_user: root
+      frequency: daily
+      user: root

salt/buildbot/init.sls

@@ -49,6 +49,16 @@ buildbot-user:
       - user: buildbot-user
       - file: /srv
 
+{# vagrant up fails due to this file not existing (see: https://github.com/python/psf-salt/pull/367#issuecomment-2218636563) #}
+/srv/buildbot/master/twistd.log:
+  file.managed:
+    - user: buildbot
+    - group: buildbot
+    - mode: "0644"
+    - replace: False
+    - require:
+      - git: /srv/buildbot
+
 update-master:
   cmd.run:
     - runas: buildbot

salt/pythontest/init.sls

@@ -46,6 +46,12 @@ inn2:
     - user: www-data
     - group: www-data
 
+/nonexistent:
+  file.directory:
+    - user: nginx
+    - group: nginx
+    - mode: "0755"
+
 testdata-repo:
   git.latest:
     - name: https://github.com/python/pythontestdotnet