From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 8 Apr 2009 07:58:00 +0000 (+0200)
Subject: tartini and new group forums
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=86ecf0dd83e246c6a34bb3809341ee44fd990b8e;p=mirror%2Fdsa-puppet.git

tartini and new group forums
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 9e5450672..90af40b89 100644
--- 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,gluck,rietz,unger:    { 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,rietz,unger,tartini:    { include sudo }
         default:   {}
     }
 }
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index c46925ce2..3a0018b8f 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -50,6 +50,7 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status
 %buildd		ALL=(buildd)	ALL
 %debbugs	ALL=(debbugs)	ALL
 %debwww		ALL=(debwww)	ALL
+%forums		ALL=(forums)	ALL
 %lintian	ALL=(lintian)	ALL
 %mirroradm	ALL=(archvsync)	ALL
 %piuparts	ALL=(piupartsm)	ALL
diff --git a/modules/sudo/files/per-host/tartini.debian.org/sudoers b/modules/sudo/files/per-host/tartini.debian.org/sudoers
deleted file mode 100644
index b64a3c306..000000000
--- a/modules/sudo/files/per-host/tartini.debian.org/sudoers
+++ /dev/null
@@ -1,24 +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.
-#
-
-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
-
-jeroen  ALL=(ALL) ALL
-
-%forums ALL=(forums) ALL
-
-nagios  ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/samhain -t check --foreground -p err -s none -l none -m none