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

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

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 55262b079ebb0e181e6091c2220b10d42cdef0a3..a1eb9722bc0cc3a7e258466999530616f0f488aa 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -27,10 +27,10 @@ Host_Alias  WEBHOSTS        = wolkenstein
 Host_Alias     SECHOSTS        = chopin
 Host_Alias     FTPHOSTS        = franck, morricone, bizet
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
-Host_Alias     AACRAIDHOSTS    = bellini, morricone, paganini, respighi, vivaldi, beethoven, pettersson
+Host_Alias     AACRAIDHOSTS    = bellini, morricone, paganini, respighi, beethoven, pettersson
 Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius
 Host_Alias     MPTRAIDHOSTS    = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field
-Host_Alias     MEGACTLHOSTS    = lindberg, englund, heininen, nielsen
+Host_Alias     MEGACTLHOSTS    = lindberg, englund, nielsen
 Host_Alias  LISTHOSTS   = bendel
 
 # Cmnd alias specification
@@ -166,9 +166,6 @@ debwww              WEBHOSTS=(archvsync)    NOPASSWD: /home/archvsync/webmirrors/runmirrors
 # geodns may reload bind
 geodnssync     geo1,geo2,geo3=(root)   NOPASSWD: /etc/init.d/bind9 reload
 geodnssync     geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
-# fossology
-%fossy         vivaldi=(root)          /etc/init.d/fossology
-%fossy         vivaldi=(fossy)         ALL
 
 # Porter work
 %porter-armel  abel,agricola=(root)    /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot