Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD

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

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 97852c5..bdf87ae 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -54,7 +54,6 @@ root  ALL=(ALL) ALL
 %zivit-admins  ZIVITHOSTS=(ALL)        NOPASSWD: ALL
 
 # nagios
-nagios         ALL=(ALL)       NOPASSWD: /bin/systemctl is-system-running
 nagios         MQ_HOSTS=(rabbitmq)     NOPASSWD: /usr/sbin/rabbitmqctl list_queues -p dsa name messages consumers
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/service ekeyd-egd-linux restart
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/service samhain restart
@@ -62,6 +61,7 @@ nagios                ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-filesystems ""
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-libs --ignore-younger=1h
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-stunnel-sanity ""
+nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-systemd-services ""
 nagios         handel=(puppet) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem
 # with smartarray controllers
 nagios         ALL=(ALL)       NOPASSWD: /sbin/hpasmcli ""
@@ -189,6 +189,7 @@ buildd              ALL=(ALL)               NOPASSWD: ALL
 %backports     FTPHOSTS,coccia=(staticsync)    NOPASSWD: /usr/local/bin/static-update-component backports.debian.org
 %bootstrap     boott=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component bootstrap.debian.net
 d-i            dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component d-i.debian.org
+debian-cd      casulana=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component cdbuilder-logs.debian.org
 lucas          dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debaday.debian.net
 dsa            dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component dsa.debian.org
 dak            FTPHOSTS=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component incoming.debian.org