X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=284b4fd34b4262168f1d34ab1e3b30947dcc4aa5;hb=399d35984a7b52c7e5b30a3e57c36770311a8321;hp=996dbdcf76e55b2d10f917dfd026f448ace8c02e;hpb=a6c8a075fc87483629c81bcfc16983e307b73864;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 996dbdcf7..284b4fd34 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -24,6 +24,7 @@ Defaults	passprompt="[sudo] password for %u on %h: "
 Host_Alias	QAHOSTS		= master, merkel
 Host_Alias	WEBHOSTS	= klecker, wolkenstein
 Host_Alias	SECHOSTS	= klecker, chopin
+Host_Alias	FTPHOSTS	= ries, franck
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
@@ -60,6 +61,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
@@ -106,22 +109,22 @@ piupartss	piatti=(ALL)		NOPASSWD: ALL
 # trigger of mirror run for packages
 pkg_user	powell=(archvsync)	NOPASSWD: /home/archvsync/bin/pushpdo
 # on draghi, the domains git thing will run bind9 reload afterwards
-%adm		draghi=(root)		NOPASSWD: /etc/init.d/bind9 reload
-%adm		draghi=(geodnssync)	NOPASSWD: /usr/bin/make -C /srv/db.debian.org/dns
+%dnsadm		draghi=(root)		NOPASSWD: /etc/init.d/bind9 reload
+%dnsadm		draghi=(geodnssync)	NOPASSWD: /usr/bin/make -C /srv/dns.debian.org/geo
 # remote power to babylon5 in the same rack:
-joerg		unger=(ALL)		/usr/bin/sispmctl -t 1, /usr/bin/sispmctl -g 1
+joerg		unger=(ALL)		/usr/bin/sispmctl -t [12], /usr/bin/sispmctl -g [12]
 # wbadm can update all buildd* users' keys on buildd.d.o
 %wbadm		cimarosa,grieg=(root)		/usr/local/bin/update-buildd-sshkeys
 wbadm		cimarosa,grieg=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
 # mirror push
-dak		ries=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
+dak		FTPHOSTS=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
 planet		senfl=(archvsync)	NOPASSWD: /home/archvsync/bin/runplanet ""
 # archvsync triggers snapshot
 archvsync	stabile=(snapshot)	NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
 archvsync	sibelius=(snapshot)	NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
 # dak stuff
-%debian-release	ries=(dak)		/usr/local/bin/dak transitions --import *
-%ftpteam	ries=(dak)		/usr/local/bin/dak transitions --import *
+%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] -- *
@@ -140,11 +143,12 @@ geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /etc/init.d/bind9 reload
 geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /usr/sbin/rndc reconfig
 
 # Porter work
-%porter-alpha	albeniz=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-armel	agricola=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-amd64	pergolesi=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-hppa	paer=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-ia64	merulo=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-ppc	pescetti=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-s390	zelenka=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots
-%porter-sparc	smetana,sperger,zee=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots
+%porter-alpha	albeniz=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-armel	agricola=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%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