X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=df82c2a67fb77edfa4602b17dc8758905205cfb0;hb=6b838d7e34a256cdc13bb393771c502482d9d753;hp=189fcf523d549a85a135a2acb58cb5f1b886c5b7;hpb=1799bb689ed1adb565be1bb1bbf712a77d96eab1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 189fcf523..df82c2a67 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -44,6 +44,12 @@ root	ALL=(ALL) ALL
 
 # DSA and local admins
 %adm		ALL=(ALL)	ALL
+
+# XXX
+# until march 2017
+93sam		acker=(ALL)	ALL
+kibi		acker=(ALL)	ALL
+
 %adm		ALL=(ALL)	NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get upgrade, /usr/bin/apt-get dist-upgrade, /usr/bin/apt-get clean, /usr/sbin/samhain -t check -i -p err -s none -l none -m none, /usr/sbin/upgrade-porter-chroots
 
 %zivit-admins	ZIVITHOSTS=(ALL)	NOPASSWD: ALL
@@ -215,6 +221,7 @@ pabs		dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component time
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component miniconf10.debconf.org
 mini-dak	porta=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component incoming.ports.debian.org
 %wbadm		wuiet=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component apt.buildd.debian.org
+%manpages	manziarly=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component manpages.debian.org
 
 # The piuparts slave needs to handle chroots
 piupartss	PIUPARTS_SLAVE_HOSTS=(ALL)		NOPASSWD: ALL
@@ -227,7 +234,6 @@ letsencrypt	denis=(dnsadm)			NOPASSWD: /srv/dns.debian.org/bin/update
 %wbadm		BUILDD_MASTER=(root)		/usr/local/bin/update-buildd-sshkeys
 # mirror push
 dak		FTPHOSTS,SECHOSTS=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
-dak		FTHOSTS=(backports)	NOPASSWD: /home/backports/bin/update-archive
 # archvsync triggers snapshot
 archvsync	sibelius=(snapshot)	NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
 archvsync	sibelius=(snapshot)	NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
@@ -267,20 +273,6 @@ nagiosadm	tchaikovsky=(root)		NOPASSWD: /usr/sbin/service icinga reload
 %Debian,%guest,%d-i	PORTERBOXES=(root)	NOPASSWD: /usr/local/bin/dd-schroot-cmd
 
 
-# Openstack stuff
-Defaults:neutron !requiretty
-nova		NOVAHOSTS=(root)	NOPASSWD: /usr/bin/nova-rootwrap *
-neutron		NOVAHOSTS=(root)	NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf *
-cinder		NOVAHOSTS=(root)	NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf *
-%openstack	NOVAHOSTS=(keystone)	ALL
-%openstack	NOVAHOSTS=(memcache)	ALL
-%openstack	NOVAHOSTS=(ceilometer)	ALL
-%openstack	NOVAHOSTS=(cinder)	ALL
-%openstack	NOVAHOSTS=(glance)	ALL
-%openstack	NOVAHOSTS=(heat)	ALL
-%openstack	NOVAHOSTS=(neutron)	ALL
-%openstack	NOVAHOSTS=(nova)	ALL
-
 # ports stuff
 mini-dak	porta=(archvsync)	NOPASSWD: /home/archvsync/signal_ports
 mini-dak	porta=(archvsync)	NOPASSWD: /home/archvsync/signal_ports-cd