X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=e0ca73ec0464f0b943dddfdf27f2e99c6e7765cf;hb=2cc7fc7d745522b4ce944dc6774f8651593d1c4c;hp=a7f8e86188d8715ce4b22a6a44d92827143b7f50;hpb=412c8ece737746a2a4e33c75e7e79270c8680077;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index a7f8e8618..e0ca73ec0 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -48,6 +48,7 @@ root	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
 
@@ -190,6 +191,7 @@ dak		FTPHOSTS=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component inc
 dak		FTPHOSTS=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component metadata.ftp-master.debian.org
 %publicity	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
 %publicity	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component micronews.debian.org
+%mirroradm	melartin=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component mirror-master.debian.org
 %debdelta	donizetti=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component debdeltas.debian.net
 %webwml		master=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component network-test.debian.org
 planet		philp=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
@@ -233,7 +235,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
@@ -273,20 +274,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