Have name copied to longname if there is no longname

[mirror/dsa-puppet.git] / modules / sudo / files / common / sudoers

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index f0ac590..d0f32ba 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -43,7 +43,6 @@ root  ALL=(ALL) ALL
 %adm           ALL=(ALL)       ALL
 %adm           ALL=(ALL)       NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get upgrade, /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, /usr/sbin/upgrade-porter-chroots
 
-admin          agnesi=(ALL)    ALL
 %zivit-admins  ZIVITHOSTS=(ALL)        NOPASSWD: ALL
 
 # nagios
@@ -119,8 +118,7 @@ nagios              beethoven=(debbackup)   NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 dak            ALL=(dak-unpriv)        NOPASSWD: ALL
 
 # some groups are in apachectrl on "their" hosts so they can reload apache and update their vhost
-%atlas         vescum=(root)   /usr/local/sbin/apache2-vhost-update
-%check         sergii=(root)   /usr/local/sbin/apache2-vhost-update
+%apachectrl    ALL=(root)      /usr/sbin/apache2-vhost-update
 
 # buildd
 # FIXME: change that ALL for hosts to a hostlist of buildds?
@@ -182,4 +180,4 @@ geodnssync  geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
 %porter-mips   eder,gabrielli=(root)   NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-ppc    partch=(root)           NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-s390   zelenka=(root)          NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-sparc  smetana,sperger,zee=(root)      NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-sparc  smetana,sperger=(root)  NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot