Merge branch 'master' of git+ssh://zobel@handel.debian.org/srv/puppet.debian.org...

diff --combined modules/sudo/files/common/sudoers
index 94261bd,d7ab956..7d8c960
--- 1/modules/sudo/files/common/sudoers
--- 2/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@@ -8,7 -8,7 +8,7 @@@
  ###################################################################
  ###################################################################
  ##
 -## PLEASE EDIT THIS FILE WITH THE visud COMMAND TO ENSURE IT
 +## PLEASE EDIT THIS FILE WITH THE visudo COMMAND TO ENSURE IT
  ## IS SYNTACTICALLY VALID.
  ##
  ##  /usr/sbin/visudo -f sudoers
@@@ -88,8 -88,8 +88,8 @@@ buildd                ALL=(ALL)               NOPASSWD: AL
  piupartss     piatti=(ALL)            NOPASSWD: ALL
  # trigger of mirror run for packages
  pkg_user      powell=(archvsync)      NOPASSWD: /home/archvsync/bin/pushpdo
- # on samosa, the domains git thing will run bind9 reload afterwards
- %adm          samosa=(root)           NOPASSWD: /etc/init.d/bind9 reload
+ # on draghi, the domains git thing will run bind9 reload afterwards
+ %adm          draghi=(root)           NOPASSWD: /etc/init.d/bind9 reload
  # remote power to babylon5 in the same rack:
  joerg         unger=(ALL)             /usr/bin/sispmctl -t 1, /usr/bin/sispmctl -g 1
  # wbadm can update all buildd* users' keys on buildd.d.o