From bbc4925df1547a2129f4402acb3e1c1f1e882293 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 8 Apr 2009 09:37:44 +0200
Subject: [PATCH] wikiadm/widor

---
 manifests/site.pp                             |  2 +-
 modules/sudo/files/common/sudoers             |  1 +
 .../files/per-host/widor.debian.org/sudoers   | 34 -------------------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 modules/sudo/files/per-host/widor.debian.org/sudoers

diff --git a/manifests/site.pp b/manifests/site.pp
index 221fbe22e..c8f4f051f 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:    { 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:    { include sudo }
         default:   {}
     }
 }
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index b8bc0b8c1..2d64b54c9 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -45,6 +45,7 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status
 
 # groups and their role accounts
 %mirroradm	ALL=(archvsync)	ALL
+%wikiadm	ALL=(wiki)	ALL
 
 # some groups are in apachectrl on "their" hosts so they can reload apache and update their vhost
 %apachectrl	ALL=(root)	/usr/sbin/apache2-vhost-update
diff --git a/modules/sudo/files/per-host/widor.debian.org/sudoers b/modules/sudo/files/per-host/widor.debian.org/sudoers
deleted file mode 100644
index 0500460e8..000000000
--- a/modules/sudo/files/per-host/widor.debian.org/sudoers
+++ /dev/null
@@ -1,34 +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
-##
-
-# /etc/sudoers
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# See the man page for details on how to write a sudoers file.
-#
-
-Defaults	env_reset
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root	ALL=(ALL) ALL
-
-# Uncomment to allow members of group sudo to not need a password
-# (Note that later entries override this, so you might need to move
-# it further down)
-# %sudo ALL=NOPASSWD: ALL
-%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
-%wikiadm ALL=(wiki) 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
-
-- 
2.20.1