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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (21 commits)
  Revert "pettersson has bpo acpid"
  Revert "pettersson has bpo acpid"
  pettersson has bpo acpid
  mayer has new kernel and linux-base now
  new-ftp-master starts with a firewall
  Add franck.debian.org
  update authorized_keys
  and an rsync rule
  BT seeding should be on v6 as well
  a few powell  specific rules
  powell gets ferm
  add limit_bing rule
  paer now has linux-base
  all hosts have root: debian-admin@d.o in /etc/aliases, we don't need it here
  add %porter-mips
  quote link target
  add kill link
  and enable monit from inittab: what could go wrong?
  define init q command
  spurious whitespace change
  ...

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 2e0c648..d0d0534 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -60,6 +60,8 @@ nagios                puccini=(ALL)   NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
 nagios         MPTRAIDHOSTS=(ALL)      NOPASSWD: /usr/sbin/mpt-status -s
 nagios         AACRAIDHOSTS=(ALL)      NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
 nagios         MEGARAIDHOSTS=(ALL)     NOPASSWD: /usr/local/bin/megarc -AllAdpInfo -nolog, /usr/local/bin/megarc -dispCfg -a0 -nolog
+# other nagios things
+nagios         beethoven=(debbackup)   NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg
 
 # groups and their role accounts
 %buildd                ALL=(buildd)    ALL