From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 8 Apr 2009 08:26:22 +0000 (+0200)
Subject: merkel.  new groups: nm and dde
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=06bdad6a92d22ee019f7b22dc918d40bd2ac7882;p=mirror%2Fdsa-puppet.git

merkel.  new groups: nm and dde
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 11199447c..d5c3ad7ef 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,tartini,mahler,raff,chopin,ravel,ries,master:    { 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,mahler,raff,chopin,ravel,ries,master,merkel:    { include sudo }
         default:   {}
     }
 }
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index f7f1580f2..11fce4590 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -54,6 +54,7 @@ nagios		puccini=(ALL)	NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
 # groups and their role accounts
 %buildd		ALL=(buildd)	ALL
 %d-i		ALL=(d-i)	ALL
+%dde		ALL=(dde)	ALL
 %debadmin	ALL=(dak)	ALL
 %debbugs	ALL=(debbugs)	ALL
 %debian-release	ALL=(release)	ALL
@@ -62,6 +63,7 @@ nagios		puccini=(ALL)	NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
 %keyring	ALL=(keyring)	ALL
 %lintian	ALL=(lintian)	ALL
 %mirroradm	ALL=(archvsync)	ALL
+%nm		ALL=(nm)	ALL
 %piuparts	ALL=(piupartsm)	ALL
 %piuparts	ALL=(piupartss)	ALL
 %pkg_maint	ALL=(pkg_user)	ALL
diff --git a/modules/sudo/files/per-host/merkel.debian.org/sudoers b/modules/sudo/files/per-host/merkel.debian.org/sudoers
deleted file mode 100644
index 7d014a611..000000000
--- a/modules/sudo/files/per-host/merkel.debian.org/sudoers
+++ /dev/null
@@ -1,49 +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
-
-%debbugs	ALL=(debbugs) ALL
-%nm		ALL=(nm) ALL
-%dde		ALL=(dde) ALL
-%debadmin	ALL=(katie) NOPASSWD: ALL
-%debadmin	ALL=(dak) ALL
-%debadmin	ALL=(archvsync) NOPASSWD: ALL
-
-%apachectrl	ALL=(root) /usr/sbin/apache2-vhost-update
-
-# QA
-weasel    ALL=(qa) ALL
-aba       ALL=(qa) ALL
-jeroen    ALL=(qa) ALL
-myon      ALL=(qa) ALL
-hertzog   ALL=(qa) ALL
-lucas     ALL=(qa) ALL
-joerg     ALL=(qa) ALL
-djpig     ALL=(qa) 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