From 009d6e0ebeb73d221ed550caa5ba407d8ac2ab17 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 8 Apr 2009 10:03:26 +0200 Subject: [PATCH] ravel and d-i --- manifests/site.pp | 2 +- modules/sudo/files/common/sudoers | 1 + .../files/per-host/ravel.debian.org/sudoers | 39 ------------------- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 modules/sudo/files/per-host/ravel.debian.org/sudoers diff --git a/manifests/site.pp b/manifests/site.pp index f9edeb37a..f4c7955a7 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: { 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: { include sudo } default: {} } } diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index 0dde2670c..795e3db07 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -48,6 +48,7 @@ nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status # groups and their role accounts %buildd ALL=(buildd) ALL +%d-i ALL=(d-i) ALL %debadmin ALL=(dak) ALL %debbugs ALL=(debbugs) ALL %debwww ALL=(debwww) ALL diff --git a/modules/sudo/files/per-host/ravel.debian.org/sudoers b/modules/sudo/files/per-host/ravel.debian.org/sudoers deleted file mode 100644 index e01788529..000000000 --- a/modules/sudo/files/per-host/ravel.debian.org/sudoers +++ /dev/null @@ -1,39 +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 -%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 - -%mirroradm ALL=(archvsync) ALL -%debadmin ALL=(dak) ALL -%apachectrl ALL=(root) /usr/sbin/apache2-vhost-update -%d-i ALL=(d-i) ALL - -nagios ALL=(ALL) 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 - -- 2.20.1