From 5e26c7c9f510c9d0643ba160b0135070d992e211 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 8 Apr 2009 09:54:39 +0200 Subject: [PATCH] gluck and more groups: debwww, lintian, planet, popcon, snapshot --- manifests/site.pp | 2 +- modules/sudo/files/common/sudoers | 7 ++- .../files/per-host/gluck.debian.org/sudoers | 44 ------------------- 3 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 modules/sudo/files/per-host/gluck.debian.org/sudoers diff --git a/manifests/site.pp b/manifests/site.pp index c13ecb2ea..7292a273a 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: { 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: { include sudo } default: {} } } diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index 1124e195e..8591a213b 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -47,12 +47,17 @@ nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]I\:[0-9 nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status # groups and their role accounts -%debbugs ALL=(debbugs) ALL %buildd ALL=(buildd) ALL +%debbugs ALL=(debbugs) ALL +%debwww ALL=(debwww) ALL +%lintian ALL=(lintian) ALL %mirroradm ALL=(archvsync) ALL %piuparts ALL=(piupartsm) ALL %piuparts ALL=(piupartss) ALL %pkg_maint ALL=(pkg_user) ALL +%planet ALL=(planet) ALL +%popcon ALL=(popcon) ALL +%snapshot ALL=(snapshot) ALL %uddadm ALL=(udd) ALL %wikiadm ALL=(wiki) ALL diff --git a/modules/sudo/files/per-host/gluck.debian.org/sudoers b/modules/sudo/files/per-host/gluck.debian.org/sudoers deleted file mode 100644 index 090b1b62c..000000000 --- a/modules/sudo/files/per-host/gluck.debian.org/sudoers +++ /dev/null @@ -1,44 +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 - -%popcon ALL=(popcon) ALL -%debwww ALL=(debwww) ALL -%planet ALL=(planet) ALL -%lintian ALL=(lintian) ALL -%snapshot ALL=(snapshot) ALL - -%mirroradm ALL=(archvsync) ALL - -nagios ALL=(root) 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