Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Also allow apt-get update

diff --combined modules/sudo/files/common/sudoers
index 8c79c24cb6cdd92b7e9ea69beb6110d118e85ef8,7db4312fc4189cd4a60680970ff0d7f587c9b2ed..90d56b9e828b41d450e9266414bf983cf6c19cee
--- 1/modules/sudo/files/common/sudoers
--- 2/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@@ -38,7 -38,7 +38,7 @@@ root  ALL=(ALL) AL
  
  # DSA and local admins
  %adm          ALL=(ALL)       ALL
- %adm          ALL=(ALL)       NOPASSWD: /usr/bin/apt-get update, /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
+ %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
  
  admin         agnesi=(ALL)    ALL
  %zivit-admins ZIVITHOSTS=(ALL)        NOPASSWD: ALL
@@@ -132,8 -132,8 +132,8 @@@ debbugs-mirror     rietz=(root)            NOPASSWD: 
  %debian-release       FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
  %ftpteam      FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
  # security
 -%security     SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR] -- *
 -%sec_public   SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR] -- *
 +%security     SECHOSTS=(dak)          NOPASSWD: /usr/local/bin/dak new-security-install -[AR]
 +%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
  # web stuff