From 5237ac7769ca8cfadc64ca951a34f60758871b16 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Dec 27 2023 00:42:10 +0000
Subject: Drop sudoers admin group includes from roles


No longer needed / generated from pillar/common/sudo.sls now.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

---

diff --git a/pillar/role/common/wiki.sls b/pillar/role/common/wiki.sls
index 6d1d4ec..56eb7d1 100644
--- a/pillar/role/common/wiki.sls
+++ b/pillar/role/common/wiki.sls
@@ -1,10 +1,3 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_wiki-admins:
-      groups:
-        wiki-admins:
-          - 'ALL=(ALL) ALL'
-
 zypper:
   repositories:
     openSUSE:infrastructure:wiki:
diff --git a/pillar/role/debuginfod.sls b/pillar/role/debuginfod.sls
index 06ca7d7..a98f223 100644
--- a/pillar/role/debuginfod.sls
+++ b/pillar/role/debuginfod.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_debuginfod-admins:
-      groups:
-        debuginfod-admins:
-          - 'ALL=(ALL) ALL'
+# empty :-(
diff --git a/pillar/role/documentation.sls b/pillar/role/documentation.sls
index ce329d9..a98f223 100644
--- a/pillar/role/documentation.sls
+++ b/pillar/role/documentation.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_documentation-admins:
-      groups:
-        documentation-admins:
-          - 'ALL=(ALL) ALL'
+# empty :-(
diff --git a/pillar/role/ircbot.sls b/pillar/role/ircbot.sls
index 9628189..a98f223 100644
--- a/pillar/role/ircbot.sls
+++ b/pillar/role/ircbot.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_ircbot-admins:
-      groups:
-        ircbot-admins:
-          - 'ALL=(root) /usr/bin/su - supybot,/usr/sbin/rcsupybot *'
+# empty :-(
diff --git a/pillar/role/kanidm.sls b/pillar/role/kanidm.sls
index 2e48979..a98f223 100644
--- a/pillar/role/kanidm.sls
+++ b/pillar/role/kanidm.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_kanidm-admins:
-      groups:
-        kanidm-admins:
-          - 'ALL=(ALL) ALL'
+# empty :-(
diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index 4bb5fad..017f882 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -78,13 +78,6 @@ nginx:
                     - proxy_pass: http://mailmanweb
           enabled: True
 
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_mailman3-admins:
-      groups:
-        mailman3-admins:
-          - 'ALL=(ALL) ALL'
-
 zypper:
   packages:
     archrwr: {}
diff --git a/pillar/role/manpages.sls b/pillar/role/manpages.sls
index 7a945be..a98f223 100644
--- a/pillar/role/manpages.sls
+++ b/pillar/role/manpages.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_manpages-admins:
-      groups:
-        manpages-admins:
-          - 'ALL=(ALL) ALL'
+# empty :-(
diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index 20f1c1e..f445e56 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -222,13 +222,6 @@ nginx:
                     - proxy_pass: http://localhost:9005
           enabled: True
 
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_matrix-admins:
-      groups:
-        matrix-admins:
-          - 'ALL=(ALL) ALL'
-
 apparmor:
   profiles:
     matrix-synapse:
diff --git a/pillar/role/monitoring.sls b/pillar/role/monitoring.sls
index 9bce374..d93e36a 100644
--- a/pillar/role/monitoring.sls
+++ b/pillar/role/monitoring.sls
@@ -117,10 +117,3 @@ profile:
         - perl-Nagios-Plugin
         - perl-Number-Format
 {%- endif %}
-
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_monitoring-admins:
-      groups:
-        monitoring-admins:
-          - 'ALL=(ALL) ALL'
diff --git a/pillar/role/osc-collab.sls b/pillar/role/osc-collab.sls
index ead764a..a98f223 100644
--- a/pillar/role/osc-collab.sls
+++ b/pillar/role/osc-collab.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_osc-collab-admins:
-      groups:
-        osc-collab-admins:
-          - 'ALL=(ALL) ALL'
+# empty :-(
diff --git a/pillar/role/web_osem.sls b/pillar/role/web_osem.sls
index 6c31891..ab19734 100644
--- a/pillar/role/web_osem.sls
+++ b/pillar/role/web_osem.sls
@@ -1,10 +1,5 @@
 sudoers:
-  included_files:
-    /etc/sudoers.d/osem:
-      groups:
-        osem-admins:
-          - 'ALL=(ALL) ALL'
-      users:
-        osem:
-          - 'ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem-dj'
-          - 'ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem'
+  users:
+    osem:
+      - 'ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem-dj'
+      - 'ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart osem'
diff --git a/pillar/role/web_tsp.sls b/pillar/role/web_tsp.sls
index 74e939f..1bcf43a 100644
--- a/pillar/role/web_tsp.sls
+++ b/pillar/role/web_tsp.sls
@@ -35,10 +35,3 @@ nginx:
                 - access_log: /var/log/nginx/tsp.access.log combined
                 - error_log: /var/log/nginx/tsp.error.log
           enabled: True
-
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_tsp-admins:
-      groups:
-        tsp-admins:
-          - 'ALL=(ALL) ALL'
diff --git a/pillar/role/weblate.sls b/pillar/role/weblate.sls
index c7ae3cb..a98f223 100644
--- a/pillar/role/weblate.sls
+++ b/pillar/role/weblate.sls
@@ -1,6 +1 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_weblate-admins:
-      groups:
-        weblate-admins:
-          - 'ALL=(ALL) ALL'
+# empty :-(