Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index bfa938920fc770fd053b04c53ceb1a0729df120a..defa71ea99fddfd93a2d84ec3bce4012add581a8 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -26,7 +26,7 @@ Host_Alias    WEBHOSTS        = wolkenstein
 Host_Alias     SECHOSTS        = chopin
 Host_Alias     FTPHOSTS        = franck, ries
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
-Host_Alias     AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
+Host_Alias     AACRAIDHOSTS    = bellini, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius
 Host_Alias     MPTRAIDHOSTS    = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field
 
@@ -38,7 +38,7 @@ root  ALL=(ALL) ALL
 
 # DSA and local admins
 %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, /usr/sbin/upgrade-porter-chroots
+%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
@@ -132,8 +132,8 @@ debbugs-mirror      rietz=(root)            NOPASSWD: /usr/bin/vos release -id srv.mirrors.bugs
 %debian-release        FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
 %ftpteam       FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
 # security
-%security      SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR] -- *
-%sec_public    SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR] -- *
+%security      SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR]
+%sec_public    SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR]
 %sec_public    SECHOSTS=(dak)          NOPASSWD: /home/dak/trigger_mirror
 dak            SECHOSTS=(archvsync)    NOPASSWD: /home/archvsync/signal_security
 # web stuff