From c07d0174d8b5e64bb66187a6bc63815328f5492f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 8 Apr 2009 10:23:25 +0200 Subject: [PATCH] master: %secretary, qa mess, and mpt-status raid for nagios --- manifests/site.pp | 2 +- modules/sudo/files/common/sudoers | 6 ++- .../files/per-host/master.debian.org/sudoers | 43 ------------------- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 modules/sudo/files/per-host/master.debian.org/sudoers diff --git a/manifests/site.pp b/manifests/site.pp index 3eb7e00f7..11199447c 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: { 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: { include sudo } default: {} } } diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index a404c23ad..f7f1580f2 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -20,8 +20,9 @@ Defaults env_reset # Host alias specification - +Host_Alias QAHOSTS = master, merkel # User alias specification +User_Alias QACORE = aba, djpig, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack # Cmnd alias specification @@ -46,6 +47,7 @@ nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]\:[0-9] 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 # other raid controllers +nagios master=(ALL) NOPASSWD: /usr/sbin/mpt-status -s nagios powell=(ALL) NOPASSWD: /usr/local/sbin/areca-cli vsf info nagios puccini=(ALL) NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status @@ -65,10 +67,12 @@ nagios puccini=(ALL) NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status %pkg_maint ALL=(pkg_user) ALL %planet ALL=(planet) ALL %popcon ALL=(popcon) ALL +%secretary ALL=(secretary) ALL %snapshot ALL=(snapshot) ALL %uddadm ALL=(udd) ALL %wbadm ALL=(wbadm) ALL %wikiadm ALL=(wiki) ALL +QACORE QAHOSTS=(qa) 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/master.debian.org/sudoers b/modules/sudo/files/per-host/master.debian.org/sudoers deleted file mode 100644 index 5492a1e41..000000000 --- a/modules/sudo/files/per-host/master.debian.org/sudoers +++ /dev/null @@ -1,43 +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. -# - -# Host alias specification -Host_Alias BUGS = master, spohr - -# 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 - -%debbugs BUGS=(debbugs) NOPASSWD: ALL -%secretary ALL=(secretary) ALL - -# QA -tbm ALL=(qa) ALL -weasel ALL=(qa) ALL -aba ALL=(qa) ALL -jeroen ALL=(qa) ALL -myon ALL=(qa) ALL -hertzog ALL=(qa) ALL -lucas ALL=(qa) ALL -luk ALL=(qa) ALL -zack ALL=(qa) ALL -djpig ALL=(qa) ALL - - -nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup "" -nagios ALL=(ALL) NOPASSWD: /usr/sbin/mpt-status -s -nagios ALL=(ALL) NOPASSWD: /usr/sbin/samhain -t check --foreground -p err -s none -l none -m none -- 2.20.1