Add sudo entries for new nm-web, contributors, contributors-web users
[mirror/dsa-puppet.git] / modules / sudo / files / sudoers
index ce66057..6c9a72e 100644 (file)
@@ -21,22 +21,24 @@ Defaults    env_reset
 Defaults       passprompt="[sudo] password for %u on %h: "
 Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
+# Find binaries to be executed as archvsync user also in its home, so the
+# caller does not need to know.
+Defaults>archvsync secure_path="/home/archvsync/bin:/usr/local/bin:/usr/bin:/bin"
+
 # Host alias specification
 Host_Alias     VOIPHOSTS       = vogler
 Host_Alias     WEBHOSTS        = wolkenstein
-Host_Alias     SECHOSTS        = chopin
-Host_Alias     FTPHOSTS        = franck
+Host_Alias     SECHOSTS        = seger
+Host_Alias     FTPHOSTS        = fasolo
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
-Host_Alias     AACRAIDHOSTS    = respighi, beethoven, pettersson
-Host_Alias     MEGARAIDHOSTS   = rautavaara, sibelius
-Host_Alias     MPTRAIDHOSTS    = barber, biber, vitry, orff
-Host_Alias     MEGACTLHOSTS    = nielsen
+Host_Alias     AACRAIDHOSTS    = pettersson
+Host_Alias     MEGARAIDHOSTS   = sibelius
+Host_Alias     DELLHOSTS       = schumann, wieck, manda-node03, manda-node04, schmelzer, smit, new-klecker
 Host_Alias     LISTHOSTS       = bendel
 Host_Alias     BUILDD_MASTER   = wuiet
-Host_Alias     PORTERBOXES     = abel, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka
-Host_Alias     PIUPARTS_SLAVE_HOSTS    = piu-slave-bm-a
+Host_Alias     PORTERBOXES     = abel, amdahl, barriere, eller, harris, minkus, plummer, zelenka
+Host_Alias     PIUPARTS_SLAVE_HOSTS    = piu-slave-bm-a, piu-slave-ubc-01
 Host_Alias     MQ_HOSTS        = rainier, rapoport
-Host_Alias     NOVAHOSTS       = oyens, bm-bl9, bm-bl10, bm-bl11, bm-bl12
 
 # Cmnd alias specification
 
@@ -46,6 +48,7 @@ root  ALL=(ALL) ALL
 
 # DSA and local admins
 %adm           ALL=(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
@@ -56,10 +59,23 @@ nagios              ALL=(ALL)       NOPASSWD: /usr/sbin/service ekeyd-egd-linux restart
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/service samhain restart
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-filesystems ""
+nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-libs --ignore-younger=1h
+nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-stunnel-sanity ""
+nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-systemd-services ""
+nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-ucode-intel ""
+nagios         handel=(puppet) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem
+nagios         handel=(puppet) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-cert-expire /srv/puppet.debian.org/ca/ca.crt
 # with smartarray controllers
 nagios         ALL=(ALL)       NOPASSWD: /sbin/hpasmcli ""
 nagios         ALL=(ALL)       NOPASSWD: /usr/bin/arrayprobe ""
-nagios         franck=(ALL)    NOPASSWD: /usr/bin/arrayprobe -f /dev/cciss/c1d0
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller all show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld all show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld [0-9] show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd all show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd [0-9]\:[0-9] show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] show status
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller all show
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld all show
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld [0-9] show
@@ -68,47 +84,81 @@ nagios              ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9]\:
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show
 nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] show status
-nagios         franck=(ALL)    NOPASSWD: /usr/sbin/hpacucli controller slot=1 enclosure 1E\:1 show detail
 
 # other raid controllers
-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
-nagios         MEGACTLHOSTS=(ALL)      NOPASSWD: /usr/sbin/megactl -Hv
-# other nagios things
-nagios         beethoven,backuphost=(debbackup)        NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
+nagios         DELLHOSTS=(ALL)         NOPASSWD: /usr/lib/nagios/plugins/dsa-check-openmanage ""
+nagios         DELLHOSTS=(ALL)         NOPASSWD: /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0
+nagios         DELLHOSTS=(ALL)         NOPASSWD: /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0\:0
 
 # groups and their role accounts
+%alioth-archive        ALL=(alioth-archive)    ALL
+%appstream     ALL=(appstream) ALL
 %auditor       ALL=(accounting)        ALL
 %backports     ALL=(backports) ALL
 %blends                ALL=(blends)    ALL
+%bootstrap     ALL=(bootstrap) ALL
+%btslink       ALL=(btslink)   ALL
 %buildd                ALL=(buildd)    ALL
 %codesearch    ALL=(codesearch)        ALL
+%community     ALL=(community) ALL
 %d-i           ALL=(d-i)       ALL
 %dde           ALL=(dde)       ALL
 %ddtp          ALL=(ddtp)      ALL
 %debadmin      ALL=(dak)       ALL
+%debadmin      ALL=(dak-code)  ALL
+%debadmin      ALL=(codesign)  ALL
 %debbugs       ALL=(debbugs)   ALL
 %debbugs       ALL=(debbugs-mirror)    ALL
+%debconfstatic ALL=(debconfstatic)     ALL
 %debdelta      ALL=(debdelta)  ALL
 %debian-cd     ALL=(debian-cd) ALL
+%cloud-build   ALL=(cloud-build)       ALL
+%cloud-ci      ALL=(cloud-ci)  ALL
+%cloud-test    ALL=(cloud-test)        ALL
+%cloud-deploy-aws      ALL=(cloud-deploy-aws)  ALL
+%cloud-deploy-azure    ALL=(cloud-deploy-azure)        ALL
+%cloud-deploy-gce      ALL=(cloud-deploy-gce)  ALL
+%cloud-deploy-openstack        ALL=(cloud-deploy-openstack)    ALL
+%cloud-deploy-digitalocean     ALL=(cloud-deploy-digitalocean) ALL
 %debian-i18n   ALL=(debian-i18n)       ALL
+%debian-r      ALL=(debian-r)  ALL
+%debian-r      ALL=(debian-r-wb-buildd)        ALL
 %debian-release        ALL=(release)   ALL
+%debsources    ALL=(debsources)        ALL
 %debtags       ALL=(debtags)   ALL
 %debwww                ALL=(debwww)    ALL
 %dedup         ALL=(dedup)     ALL
-%btslink       ALL=(btslink)   ALL
+%dgit          ALL=(dgit)      ALL
+%dgit          ALL=(dgit-unpriv)       ALL
 %emdebian      ALL=(emdebian)  ALL
 %forums                ALL=(forums)    ALL
+%gitdoadm      ALL=(gitdoadm)  ALL
+# the git user also exists on adayevskaya where it's a different service..
+%gitdoadm      godard=(git)            ALL
+%gitdoadm      godard=(salsa-registry) ALL
+%gitdoadm      godard=(salsa-signup)   ALL
+%gitdoadm      godard=(salsa-webhook)  ALL
+%gitdoadm      godard=(salsa-pages)    ALL
+git            godard=(salsa-registry) NOPASSWD: ALL
+git            godard=(salsa-signup)   NOPASSWD: ALL
+git            godard=(salsa-webhook)  NOPASSWD: ALL
+git            godard=(salsa-pages)    NOPASSWD: ALL
 %keyring       ALL=(keyring)   ALL
+%keyring       kaufmann=(root)         NOPASSWD: /usr/sbin/service bind9 reload
 %lintian       ALL=(lintian)   ALL
 %listweb       ALL=(listweb)   ALL
 %list          LISTHOSTS=(list)        ALL
 # archives and stuff
 %list          master=(debian) ALL
+%manpages      ALL=(manpages)  ALL
 %mirroradm     ALL=(archvsync) ALL
+%mirroradm     melartin=(mirroradm)    ALL
 %nm            ALL=(nm)        ALL
+%nm            ALL=(nm-web)    ALL
+%contributors  ALL=(contributors)      ALL
+%contributors  ALL=(contributors-web)  ALL
 %patch-tracker ALL=(patch-tracker)     ALL
 %pet-devel     ALL=(pet-devel) ALL
 %piuparts      ALL=(piupartsm) ALL
@@ -124,6 +174,8 @@ nagios              beethoven,backuphost=(debbackup)        NOPASSWD: /usr/lib/nagios/plugins/dsa-c
 %security      ALL=(security)  ALL
 %snapshot      ALL=(snapshot)  ALL
 %uddadm                ALL=(udd)       ALL
+%videoteam     vittoria=(veyepar)      ALL
+%videoteam     vittoria=(sreview)      ALL
 %volatile      ALL=(volatile)  ALL
 %wbadm         ALL=(wbadm)     ALL
 %mujeres       ALL=(women)     ALL
@@ -132,6 +184,8 @@ nagios              beethoven,backuphost=(debbackup)        NOPASSWD: /usr/lib/nagios/plugins/dsa-c
 %gobby         gombert=(gobby) ALL
 %dacshelper    diabelli=(www-data)     ALL
 %debsso                diabelli=(debsso)       ALL
+%debsso-web    diabelli=(debsso-web)   ALL
+%debconf-web   debussy=(debconf-web)   ALL
 
 # the dak user gets to run stuff as dak-unpriv (for things like lintian checks)
 %ftptrainee    FTPHOSTS=(dak-unpriv)   NOPASSWD: /usr/bin/lintian
@@ -147,40 +201,71 @@ dak               ALL=(dak-unpriv)        NOPASSWD: ALL
 Defaults:buildd env_reset,env_keep+="APT_CONFIG DEBIAN_FRONTEND"
 buildd         ALL=(ALL)               NOPASSWD: ALL
 
-%backports     franck,coccia=(staticsync)      NOPASSWD: /usr/local/bin/static-update-component backports.debian.org
+%appstream     mekeel=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component appstream.debian.org
+%backports     FTPHOSTS,coccia=(staticsync)    NOPASSWD: /usr/local/bin/static-update-component backports.debian.org
+%bootstrap     boott=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component bootstrap.debian.net
 d-i            dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component d-i.debian.org
+debian-cd      casulana=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component cdbuilder-logs.debian.org
+lucas          dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debaday.debian.net
 dsa            dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component dsa.debian.org
-dak            franck=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component metadata.ftp-master.debian.org
-%debbits       master=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
+dak            FTPHOSTS=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component incoming.debian.org
+dak            FTPHOSTS=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component metadata.ftp-master.debian.org
+codesign       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,senfl=(staticsync)        NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
+planet         philp=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
 debwww         wolkenstein=(staticsync)        NOPASSWD: /usr/local/bin/static-update-component www.debian.org
 %blends                dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component blends.debian.org
 %Debian                dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component wnpp-by-tags.debian.net
 %Debian                dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component mozilla.debian.net
 %ports         dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component www.ports.debian.org
+%debian-release        respighi=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component release.debian.org
+%debian-release        coccia=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component release.debian.org-pu
 %debvoip       dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component rtc.debian.org
 %security      dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component security-team.debian.org
+%publicity     dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component timeline.debian.net
+pabs           dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component timeline.debian.net
+%lintian       lindsay=(staticsync)            NOPASSWD: /usr/local/bin/static-update-component lintian.debian.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component 10years.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf0.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf1.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf2.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf3.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf4.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf5.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf6.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf7.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf16.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf17.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component debconf18.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component es.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component fr.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component miniconf10.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component wiki.debconf.org
+%debconfstatic dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component www.debconf.org
+mini-dak       porta=(staticsync)              NOPASSWD: /usr/local/bin/static-update-component incoming.ports.debian.org
+%manpages      manziarly=(staticsync)          NOPASSWD: /usr/local/bin/static-update-component manpages.debian.org
+%dpl           dillon=(staticsync)             NOPASSWD: /usr/local/bin/static-update-component dpl.debian.org
+%keyring       kaufmann=(staticsync)           NOPASSWD: /usr/local/bin/static-update-component openpgpkey.debian.org
 
 # The piuparts slave needs to handle chroots
 piupartss      PIUPARTS_SLAVE_HOSTS=(ALL)              NOPASSWD: ALL
 # trigger of mirror run for packages
-#pkg_user      powell=(archvsync)      NOPASSWD: /home/archvsync/bin/pushpdo
 dnsadm         denis=(root)                    NOPASSWD: /usr/sbin/service bind9 reload
-%dnsadm                orff=(root)             NOPASSWD: /etc/init.d/bind9 reload
-%dnsadm                orff=(geodnssync)       NOPASSWD: /usr/bin/make -C /srv/dns.debian.org/geo
-%adm           draghi=(puppet)                 NOPASSWD: /usr/bin/make -s -C /srv/db.debian.org/var/gitnagios/dsa-nagios/config install
+letsencrypt    denis=(dnsadm)                  NOPASSWD: /srv/dns.debian.org/bin/update
 # wbadm can update all buildd* users' keys on buildd.d.o
 %wbadm         BUILDD_MASTER=(wb-buildd)       ALL
 %wbadm         BUILDD_MASTER=(root)            /usr/local/bin/update-buildd-sshkeys
-#wbadm         BUILDD_MASTER=(postgres)        NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
+# wbadm can impersonate the wbadm-web user
+%wbadm         BUILDD_MASTER=(wbadm-web)       ALL
 # mirror push
-dak            FTPHOSTS,SECHOSTS=(archvsync)   NOPASSWD:/home/archvsync/runmirrors
-dak            franck=(backports)      NOPASSWD: /home/backports/bin/update-archive
-planet         senfl=(archvsync)       NOPASSWD: /home/archvsync/bin/runplanet ""
+dak            FTPHOSTS,SECHOSTS=(archvsync)   NOPASSWD:/home/archvsync/runmirrors, /home/archvsync/bin/runmirrors
 # archvsync triggers snapshot
-archvsync      sibelius,stabile=(snapshot)     NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
-archvsync      sibelius,stabile=(snapshot)     NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
+archvsync      sibelius,sallinen=(snapshot)    NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
+archvsync      sibelius=(snapshot)             NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
 # dak stuff
 %debian-release        FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
 %ftpteam       FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
@@ -189,29 +274,36 @@ archvsync sibelius,stabile=(snapshot)     NOPASSWD: /srv/2ndsnapshot/bin/update-trig
 %sec_public    SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR]
 %sec_public    SECHOSTS=(dak)          NOPASSWD: /home/dak/trigger_mirror
 dak            SECHOSTS=(archvsync)    NOPASSWD: /home/archvsync/signal_security
+dak            SECHOSTS=(archvsync)    NOPASSWD: /home/archvsync/signal_security-buildd-pool
 # web stuff
 debwww         WEBHOSTS=(archvsync)    NOPASSWD: /home/archvsync/webmirrors/runmirrors
-%press         WEBHOSTS=(debwww)       /srv/www.debian.org/update-part News
+%publicity     WEBHOSTS=(debwww)       /srv/www.debian.org/update-part News
+%debvote       WEBHOSTS=(debwww)       /srv/www.debian.org/update-part vote
+%d-i           WEBHOSTS=(debwww)       /srv/www.debian.org/update-part devel/debian-installer
+%d-i           WEBHOSTS=(debwww)       /srv/www.debian.org/cron/lessoften-parts/1installation-guide
 # more list stuff
+%list          LISTHOSTS=(postfix)             /usr/sbin/postcat
 %list          LISTHOSTS=(root)                /usr/sbin/postfix reload
-%list          stockhausen=(root)              /usr/sbin/service jetty restart
 %list          LISTHOSTS=(root)                /usr/sbin/qshape, /usr/sbin/postsuper
-%list          LISTHOSTS=(root)                /etc/init.d/spamassassin, /etc/init.d/amavis
+%list          LISTHOSTS=(root)                /usr/sbin/service spamassassin restart, /usr/sbin/service spamassassin reload, /usr/sbin/service spamassassin stop, /usr/sbin/service spamassassin start
+%list          LISTHOSTS=(root)                /usr/sbin/service amavis restart, /usr/sbin/service amavis reload, /usr/sbin/service amavis stop, /usr/sbin/service amavis start
 %list          LISTHOSTS=(amavis)              NOPASSWD: /usr/bin/sa-learn
 %list          LISTHOSTS=(amavis)              ALL
 # geodns may reload bind
-geodnssync     geo1,geo2,geo3=(root)   NOPASSWD: /etc/init.d/bind9 reload
+geodnssync     geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/service bind9 reload
 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
-
-%Debian,%guest PORTERBOXES=(root)      NOPASSWD: /usr/local/bin/dd-schroot-cmd
-
 # voip stuff
 %debvoip       VOIPHOSTS=(root)        /usr/sbin/service resiprocate-turn-server restart, /usr/sbin/service repro restart
+%debvoip       VOIPHOSTS=(root)        /usr/sbin/service prosody restart, /usr/sbin/service prosody reload, /usr/sbin/service prosody stop, /usr/sbin/service prosody start
+# snapshot can reload apache to get the wsgi reloaded
+snapshot       lw07,sallinen=(root)    NOPASSWD: /usr/sbin/service apache2 reload
+
+%Debian,%guest,%d-i    PORTERBOXES=(root)      NOPASSWD: /usr/local/bin/dd-schroot-cmd
+
+
+# ports stuff
+mini-dak       porta=(archvsync)       NOPASSWD: /home/archvsync/signal_ports
 
-# 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 *
+#includedir /etc/sudoers.d