gluck and more groups: debwww, lintian, planet, popcon, snapshot

diff --git a/manifests/site.pp b/manifests/site.pp
index c13ecb2ea8aaa3850145ee611b95bc727a86eba0..7292a273af9d1a10de1485a405460f0d124ad924 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,7 +45,7 @@ node default {
 
     # test here first
     case $hostname {
-        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius,schein,villa,lobos,steffani,kassia,pergolesi,lafayette,rem,albeniz,goetz,smetana,allegri,puccini,ball,argento,arcadelt,dijkstra,schumann,caballero,voltaire,pescetti,mundy,agricola,goedel,lebrun,mayer,mayr,merulo,morales,murphy,paer,saens,schroeder,spontini,widor,zelenka,agnesi,piatti,powell,samosa:    { include sudo }
+        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius,schein,villa,lobos,steffani,kassia,pergolesi,lafayette,rem,albeniz,goetz,smetana,allegri,puccini,ball,argento,arcadelt,dijkstra,schumann,caballero,voltaire,pescetti,mundy,agricola,goedel,lebrun,mayer,mayr,merulo,morales,murphy,paer,saens,schroeder,spontini,widor,zelenka,agnesi,piatti,powell,samosa,gluck:    { include sudo }
         default:   {}
     }
 }

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 1124e195ecd4393bf70dcac038982894834369a3..8591a213bb20157ae48dc01cf13f71d2d8b91e8f 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -47,12 +47,17 @@ nagios              ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]I\:[0-9
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status
 
 # groups and their role accounts
-%debbugs       ALL=(debbugs)   ALL
 %buildd                ALL=(buildd)    ALL
+%debbugs       ALL=(debbugs)   ALL
+%debwww                ALL=(debwww)    ALL
+%lintian       ALL=(lintian)   ALL
 %mirroradm     ALL=(archvsync) ALL
 %piuparts      ALL=(piupartsm) ALL
 %piuparts      ALL=(piupartss) ALL
 %pkg_maint     ALL=(pkg_user)  ALL
+%planet                ALL=(planet)    ALL
+%popcon                ALL=(popcon)    ALL
+%snapshot      ALL=(snapshot)  ALL
 %uddadm                ALL=(udd)       ALL
 %wikiadm       ALL=(wiki)      ALL
 

diff --git a/modules/sudo/files/per-host/gluck.debian.org/sudoers b/modules/sudo/files/per-host/gluck.debian.org/sudoers
deleted file mode 100644 (file)
index 090b1b6..0000000
--- a/modules/sudo/files/per-host/gluck.debian.org/sudoers
+++ /dev/null
@@ -1,44 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-# sudoers file.
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# See the man page for details on how to write a sudoers file.
-#
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root   ALL=(ALL) ALL
-
-# DSA
-%adm   ALL=(ALL) ALL
-%adm    ALL=(ALL) NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get dist-upgrade, /usr/bin/apt-get clean, /usr/sbin/samhain -t check -i -p err -s none -l none -m none
-
-# HP local admin group
-%hpadmins      ALL=(ALL) ALL
-
-%popcon                ALL=(popcon) ALL
-%debwww                ALL=(debwww) ALL
-%planet                ALL=(planet) ALL
-%lintian       ALL=(lintian) ALL
-%snapshot      ALL=(snapshot) ALL
-
-%mirroradm ALL=(archvsync) ALL
-
-nagios ALL=(root) NOPASSWD: /usr/bin/arrayprobe ""
-nagios  ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller all show
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd all show
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]\:[0-9] show
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]I\:[0-9]\:[0-9] show
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/samhain -t check --foreground -p err -s none -l none -m none