X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=2a41039b350612d93078586d8b9ec9a15dd9552d;hb=28626c358492665641b0055f572a35b6186e708f;hp=d4e1a720ce4e13a3baba3267932bdea45faec57c;hpb=dc0958ea03bbfddfac2c025bdbafa8ef6e238dbf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index d4e1a720c..2a41039b3 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -29,11 +29,11 @@ Host_Alias	FTPHOSTS	= franck, morricone
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= bellini, morricone, paganini, respighi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
-Host_Alias	MPTRAIDHOSTS	= fasch, holter, barber, biber, cilea, vitry, krenek, orff
-Host_Alias	MEGACTLHOSTS	= lindberg, englund, nielsen
+Host_Alias	MPTRAIDHOSTS	= barber, biber, cilea, vitry, orff
+Host_Alias	MEGACTLHOSTS	= nielsen
 Host_Alias	LISTHOSTS	= bendel
-Host_Alias	PORTERBOXES	= agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka
-Host_Alias	PIUPARTS_SLAVE_HOSTS	= piatti, piu-slave-bm-a
+Host_Alias	PORTERBOXES	= abel, agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka
+Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a
 
 # Cmnd alias specification
 
@@ -64,8 +64,7 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] show statu
 nagios		franck=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=1 enclosure 1E\:1 show detail
 
 # other raid controllers
-#nagios		powell=(ALL)	NOPASSWD: /usr/local/sbin/areca-cli vsf info
-nagios		puccini=(ALL)	NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
+nagios		powell=(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
@@ -177,14 +176,4 @@ geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /usr/sbin/rndc reconfig
 # pushed nagiosadm reload icinga on tchaikovsky
 nagiosadm	tchaikovsky=(root)		NOPASSWD: /usr/sbin/service icinga reload
 
-# Porter work
-%porter-armel	abel,agricola=(root)	/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-armel	harris=(root)		/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-amd64	barriere,pergolesi=(root)	/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-bsd	falla,fischer=(root)	/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-ia64	merulo=(root)		/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-mips	eder,gabrielli=(root)	/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-ppc	partch=(root)		/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-s390	zelenka=(root)		/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-sparc	smetana=(root)	/usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %Debian,%guest	PORTERBOXES=(root)	NOPASSWD: /usr/local/bin/dd-schroot-cmd