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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  add gabrielli.debian.org
  add apt-in-chroot to allowed sudo commands
  add missing archs
  make porter stuff a bit nicer
  play with porter commands

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index c0d89ef..9e9e4c9 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -25,6 +25,7 @@ nameinfo:
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (14 July 1901 - 27 September 1956)
+  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 – July  10th 1690)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787)
   goedel.debian.org: Kurt Gödel (April 28, 1906 - January 14, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
@@ -212,6 +213,7 @@ host_settings:
     fasch.debian.org: mailout.debian.org
     field.debian.org: mailout.debian.org
     finzi.debian.org: mailout.debian.org
+    gabrielli.debian.org: mailout.debian.org
     geo1.debian.org: mailout.debian.org
     geo2.debian.org: mailout.debian.org
     geo3.debian.org: mailout.debian.org

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index a207aae..91b3260 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -138,3 +138,13 @@ debwww             WEBHOSTS=(archvsync)    NOPASSWD: /home/archvsync/webmirrors/runmirrors
 # geodns may reload bind
 geodnssync     geo1,geo2,geo3=(root)   NOPASSWD: /etc/init.d/bind9 reload
 geodnssync     geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
+
+# Porter work
+%porter-alpha  albeniz=(root)          NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-armel  agricola=(root)         NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-amd64  pergolesi=(root)        NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-hppa   paer=(root)             NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-ia64   merulo=(root)           NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-ppc    pescetti=(root)         NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-s390   zelenka=(root)          NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-sparc  smetana,sperger,zee=(root)      NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot