add gnumailman hosting role (#313)

python · Apr 26, 2023 · 7f35a9a · 7f35a9a
1 parent bb6e11c
commit 7f35a9a
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 0 deletions.
diff --git a/pillar/base/users.sls b/pillar/base/users.sls
@@ -83,6 +83,9 @@ users:
       mail:
         allowed: True
         sudo: True
+      gnumailman:
+        allowed: True
+        sudo: True
 
   gbrandl:
     fullname: "Georg Brandl"
@@ -250,6 +253,9 @@ users:
         sudo: True
         groups:
           - mailman
+      gnumailman:
+        allowed: True
+        sudo: True
 
   hildeb:
     fullname: "Ralf Hildebrandt"
@@ -294,6 +300,9 @@ users:
         sudo: True
         groups:
           - mailman
+      gnumailman:
+        allowed: True
+        sudo: True
 
   ambv:
     fullname: "Łukasz Langa"

diff --git a/pillar/dev/roles.sls b/pillar/dev/roles.sls
@@ -38,6 +38,10 @@ roles:
     pattern: "downloads.vagrant.psf.io"
     purpose: ""
     contact: ""
+  gnumailman:
+    pattern: "gnumailman.vagrant.psf.io"
+    purpose: ""
+    contact: ""
   hg:
     pattern: "hg.vagrant.psf.io"
     purpose: ""

diff --git a/pillar/dev/top.sls b/pillar/dev/top.sls
@@ -33,6 +33,11 @@ base:
     - firewall.rs-lb-backend
     - groups.downloads
 
+  'gnumailman':
+    - match: nodegroup
+    - firewall.mail
+    - mail-opt-out
+
   'hg':
     - match: nodegroup
     - firewall.rs-lb-backend

diff --git a/pillar/prod/backup/gnumailman.sls b/pillar/prod/backup/gnumailman.sls
@@ -0,0 +1,9 @@
+backup:
+  directories:
+    gnumailman-data:
+      source_directory: /backup/
+      target_host: backup.sfo1.psf.io
+      target_directory: /backup/gnumailman
+      target_user: gnumailman
+      frequency: hourly
+      user: root
diff --git a/pillar/prod/backup/server.sls b/pillar/prod/backup/server.sls
@@ -22,6 +22,11 @@ backup-server:
       user: python-bugs
       increment_retention: 30D
       authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsMBXD2hOm536YI0GMSratv8cM1CZ1M3J1bsvj2NqD9PEp10o3FD5ofr81kB+BTyFKMnpwxuP/dcoCfiY4dCF1COIa82nUtvuklFYTVybW8dL7DevWxoX0F6PeK8Ox+kcuASjmgx2UJ/pisKEIhFQYTF4bmevSRXbLv94461dxOO6j2MOgtJRGDmr/2OhA30VAnjMw1U+4flZd6FLodfq1udX8NVTBg05BIAwLNYLFrvLO8yMlqZzb4TbA53w29yyNIoSlXBLtG+K19mAA3ki+rqZdhdS+k6u1/u0AVUcDvmX1MrOtcvucy74SIesBDJfdyR7OFpHmAx4/aDPVdmGV
+    gnumailman-data:
+      directory: /backup/gnumailman-data
+      user: gnumailman
+      increment_retention: 90D
+      authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDcqPefaRsYhkulCx/TtNOX4BaVqfGePoQraS8ELmujkrX3KP56u2uKshIUob8uCf/daRhlWnKKIyy8redICHc/+CmUSZjSgETgdbnVIYW17sZ+hCvME8AEc/FAObFrU9BEmOHU0LwA6SY2YclL9knz/Pd94aojXGhx5FjStJg/AfOuhcSzn1dgRfBERm9JPplgubFeVDocBJ816glLydh5Qg0TG1sgJtS2dczvhc0wwfQqnAVQtnhmxjVUBedj4efNaJhXK1N1aa+i5ev3k9Es6yXV/2jyAGEXAn8eiciVHCUt0vNDz+nNnckCHCQitkaA3VnF03Di5BaiJRTqyiyzRdtzh832O3DQLO54ep/S+jgYoFfajPnFbChHNTNpVI7VJHpsE8W8XEwvcf/ZU3sW5XHxfvwYq9KjOw7LWF26IT8pka2/WPClWeG3xKs10ndV2sNUmWpRJMIRQ82JFr2/4L23qzoI++7CDjb63X6eZeK+QtLTaj6pLel9nZVIapU=
     hg:
       directory: /backup/python-hg
       user: hg

diff --git a/pillar/prod/roles.sls b/pillar/prod/roles.sls
@@ -38,6 +38,10 @@ roles:
     pattern:  "downloads*.nyc1.psf.io"
     purpose:  "Serves python.org downloads"
     contact:  "CPython Release Managers"
+  gnumailman:
+    pattern:  "gnumailman.nyc1.psf.io"
+    purpose:  "GNU Mailman Project wiki and lists"
+    contact:  "Mark Sapiro"
   hg:
     pattern:  "hg.nyc1.psf.io"
     purpose:  "Version Control Archives, serves hg.python.org and svn.python.org"

diff --git a/pillar/prod/top.sls b/pillar/prod/top.sls
@@ -58,6 +58,13 @@ base:
     - backup.downloads
     - secrets.backup.downloads
 
+  'gnumailman':
+    - match: nodegroup
+    - firewall.mail
+    - mail-opt-out
+    - backup.gnumailman
+    - secrets.backup.gnumailman
+
   'hg':
     - match: nodegroup
     - firewall.rs-lb-backend