From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 23 May 2010 12:52:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=678631469f23ba38dff2106772684f35586632f8;hp=-c;p=mirror%2Fdsa-puppet.git

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
  ...
---

678631469f23ba38dff2106772684f35586632f8
diff --combined modules/sudo/files/common/sudoers
index cfc0472fe,2e0c64864..d0d053480
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@@ -60,8 -60,6 +60,8 @@@ nagios		puccini=(ALL)	NOPASSWD: /usr/lo
  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
@@@ -147,6 -145,7 +147,7 @@@ geodnssync	geo1,geo2,geo3=(root)	NOPASS
  %porter-amd64	pergolesi=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
  %porter-hppa	paer=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
  %porter-ia64	merulo=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+ %porter-mips	gabrielli=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
  %porter-ppc	pescetti=(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