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:
  Try to configure ntpdate for hosts with broken RTC
  Revert "get rid of the apt repo until they fix it" - aba says it's all fixed
  Revert "This is part two of d93775534f19bde42d75c6debe391cc701c54993"
  Add sompek.debian.org
  This is part two of d93775534f19bde42d75c6debe391cc701c54993 Signed-off-by: Stephen Gran <steve@lobefin.net>
  get rid of the apt repo until they fix it
  That cast rather too broad a net, I think Signed-off-by: Stephen Gran <steve@lobefin.net>
  add some autopostgres munin stuff
  no more pescetti
  one more we ship with puppet
  try some dependency ordering
  add a preferences file for buildd/schroot
  another file that gets autoupdated
  new buildds
  Sort list Signed-off-by: Stephen Gran <steve@lobefin.net>
  Let's try one last time to get it right. Signed-off-by: Stephen Gran <steve@lobefin.net>
  comparison of Fixnum with String failed Signed-off-by: Stephen Gran <steve@lobefin.net>
  Obvious syntax error ... Signed-off-by: Stephen Gran <steve@lobefin.net>
  this may break a lot ...

diff --git a/manifests/site.pp b/manifests/site.pp
index 6755e0c..f94264c 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -27,6 +27,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ntpdate
     include ssl
 
     include motd
@@ -165,7 +166,11 @@ node default {
     case $kernel {
         Linux: { include entropykey }
     }
-
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
 
 # vim:set et:

diff --git a/modules/buildd/files/apt-preferences b/modules/buildd/files/apt-preferences
new file mode 100644 (file)
index 0000000..db8dd1f
--- /dev/null
+++ b/modules/buildd/files/apt-preferences
@@ -0,0 +1,7 @@
+Package: schroot
+Pin: release o=buildd.debian.org
+Pin-Priority: 500
+
+Package: schroot-common
+Pin: release o=buildd.debian.org
+Pin-Priority: 500

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index a5af7be..41efffe 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -10,6 +10,11 @@ class buildd {
     }
    
     file {
+        "/etc/apt/preferences.d/buildd":
+             source  => "puppet:///modules/buildd/apt-preferences",
+             before  => File["/etc/apt/sources.list.d/buildd.list"],
+             ;
+
         "/etc/apt/sources.list.d/buildd.list":
              content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
              require => Package["apt-transport-https"],

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 1f05d48..598d7a1 100644 (file)
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -28,6 +28,16 @@ Facter.add("postgres83") do
                FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
        end
 end
+Facter.add("postgres84") do
+       setcode do
+               FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+       end
+end
+Facter.add("postgres90") do
+       setcode do
+               FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+       end
+end
 Facter.add("postgrey") do
        setcode do
                FileTest.exist?("/usr/sbin/postgrey")

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 480740b..839b1d1 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -84,7 +84,6 @@ nameinfo:
   penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
-  pescetti.debian.org: Giovanni Battista Pescetti (ca. 1704  - 1766)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
@@ -114,6 +113,7 @@ nameinfo:
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
   smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
   soler.debian.org: Padre Antonio Soler (December 3rd, 1729 (baptized) - December 20th, 1783)
+  sompek.debian.org: Ernst Sompek (Juni 11th 1876 - August 2nd 1954)
   sperger.debian.org: Johannes Matthias Sperger (March 23th, 1750 - May 13th, 1812)
   spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
@@ -205,6 +205,8 @@ host_settings:
     - orff.debian.org
     - ravel.debian.org
     - busoni.debian.org
+  broken-rtc:
+    - sompek.debian.org
   buildd:
     - alain.debian.org
     - alkman.debian.org
@@ -231,7 +233,10 @@ host_settings:
     - hasse.debian.org
     - hebden.debian.org
     - henze.debian.org
+    - hildegard.debian.org
     - hoiby.debian.org
+    - howells.debian.org
+    - hummel.debian.org
     - krenek.debian.org
     - lebrun.debian.org
     - lucatelli.debian.org
@@ -250,8 +255,8 @@ host_settings:
     - vitry.debian.org
     - zandonai.debian.org
     - zappa.debian.org
-    - zemlinsky.debian.org
     - zee.debian.org
+    - zemlinsky.debian.org
   #wheezy:
   #  - harris.debian.org
   #  - hartmann.debian.org
@@ -328,7 +333,6 @@ host_settings:
   #  - nono.debian.org
   #  - orff.debian.org
   #  - paganini.debian.org
-  #  - pescetti.debian.org
   #  - pergolesi.debian.org
   #  - pettersson.debian.org
   #  - piatti.debian.org
@@ -466,7 +470,6 @@ host_settings:
     penalosa.debian.org: mailout.debian.org
     pergolesi.debian.org: mailout.debian.org
     peri.debian.org: mailout.debian.org
-    pescetti.debian.org: mailout.debian.org
     pettersson.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
     porpora.debian.org: mailout.debian.org
@@ -492,6 +495,7 @@ host_settings:
     sibelius.debian.org: mailout.debian.org
     smetana.debian.org: mailout.debian.org
     soler.debian.org: mailout.debian.org
+    sompek.debian.org: mailout.debian.org
     sperger.debian.org: mailout.debian.org
     spontini.debian.org: mailout.debian.org
     stabile.debian.org: mailout.debian.org

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 5e8da8c..7792b08 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,17 +1,21 @@
 class monit {
     package { "monit": ensure => installed }
 
+    $cmd = $::lsbdistcodename ? {
+         'sid'      => '/usr/bin/monit',
+         'wheezy'   => '/usr/bin/monit',
+         default  => '/usr/sbin/monit',
+    }
+
     augeas { "inittab":
         context => "/files/etc/inittab",
         changes => [ "set mo/runlevels 2345",
                      "set mo/action respawn",
-                     "set mo/process \"/usr/sbin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
+                     "set mo/process \"$cmd -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
                    ],
-        onlyif => "match mo size == 0",
         notify => Exec["init q"],
     }
 
-
     file {
         #"/etc/rc2.d/K99monit":
         #  ensure  => "../init.d/monit";

diff --git a/modules/ntpdate/files/etc-default-ntpdate b/modules/ntpdate/files/etc-default-ntpdate
new file mode 100644 (file)
index 0000000..4607f64
--- /dev/null
+++ b/modules/ntpdate/files/etc-default-ntpdate
@@ -0,0 +1,21 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+##
+
+# The settings in this file are used by the program ntpdate-debian, but not
+# by the upstream program ntpdate.
+
+# Set to "yes" to take the server list from /etc/ntp.conf, from package ntp,
+# so you only have to keep it in one place.
+NTPDATE_USE_NTP_CONF=no
+
+# List of NTP servers to use  (Separate multiple servers with spaces.)
+# Not used if NTPDATE_USE_NTP_CONF is yes.
+# merikanto    86.59.118.147
+# orff         194.177.211.209
+# ravel                206.12.19.5
+# busoni       140.211.15.34
+NTPSERVERS="86.59.118.147 194.177.211.209 206.12.19.5 140.211.15.34"
+
+# Additional options to pass to ntpdate
+NTPOPTIONS=""

diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
new file mode 100644 (file)
index 0000000..006daa5
--- /dev/null
+++ b/modules/ntpdate/manifests/init.pp
@@ -0,0 +1,21 @@
+class ntpdate {
+    case getfromhash($nodeinfo, 'broken-rtc') {
+        true: {
+            package {
+                ntpdate: ensure => installed;
+                lockfile-progs: ensure => installed;
+            }
+            file {
+                "/etc/default/ntpdate":
+                    owner   => root,
+                    group   => root,
+                    mode    => 444,
+                    source  => [ "puppet:///modules/ntpdate/etc-default-ntpdate" ],
+                    ;
+            }
+        }
+    }
+}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:

diff --git a/modules/postgres/files/plugin.conf b/modules/postgres/files/plugin.conf
new file mode 100644 (file)
index 0000000..bef22f9
--- /dev/null
+++ b/modules/postgres/files/plugin.conf
@@ -0,0 +1,14 @@
+[postgres_connections_db]
+user postgres
+
+[postgres_size_*]
+user postgres
+
+[postgres_cache_*]
+user postgres
+
+[postgres_querylength_*]
+user postgres
+
+[postgres_bgwriter]
+user postgres

diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp
new file mode 100644 (file)
index 0000000..bb2b768
--- /dev/null
+++ b/modules/postgres/manifests/init.pp
@@ -0,0 +1,19 @@
+class postgres {
+    activate_munin_check {
+        "postgres_bgwriter":;
+        "postgres_connections_db":;
+        "postgres_cache_ALL": script => "postgres_cache_";
+        "postgres_querylength_ALL": script => "postgres_querylength_";
+        "postgres_size_ALL": script => "postgres_size_";
+    }
+    file {
+        "/etc/munin/plugin-conf.d/local-postgres":
+            source  => "puppet:///modules/postgres/plugin.conf",
+            ;
+    }
+}
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
+

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6879c61..4408077 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -125,6 +125,7 @@ file=/etc/exim4/ssl
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
+file=/etc/apt/preferences.d
 file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
@@ -143,6 +144,7 @@ file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
+file=/etc/stunnel
 file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
@@ -326,6 +328,7 @@ file=/etc/apt/sources.list.d/backports.org.list
 file=/etc/apt/apt.conf.d/local-compression
 file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
+file=/etc/apt/preferences.d/buildd
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
@@ -360,6 +363,7 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-areca
 file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
+file=/etc/stunnel/puppet-ekeyd-peer.pem
 file=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
@@ -375,6 +379,7 @@ file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
+file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% end -%>
 <% if nodeinfo['muninmaster'] -%>
 file=/etc/munin/munin.conf

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 3e96b4d..71a9645 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -9,7 +9,6 @@ hosterkeys
          when "argento.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA5q3myoIMyqv6HhAR4lxaO7OXLRkKqUlEHeCudksc7ZAVSqJAQ3ODn8zAoY34duvRUOq7xpGcl8gXWujCtcUWDZCxNsxz+iWI/3oEaZly/ZTJXtoYUjmUodV7PJ8DbokiJGUIc1s3MiGa9QYam0D28TT8jWCJFcthC7VS61GBgT8= /Users/manon/.ssh/id_rsa - Manon Goo Local Admin"
          when "mahler.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1bAZGQUdVBdX5N8985OG25yYO6wybV0HmL0jeyun8qOmyi15RlkP8XiWXkvBLE98Nh9Ji2UgMZog7geT65zf+bE2crxu9LmAIbNiMgh+Yk6JFCy8ZFiKmCngHLlkWlD3Z4YTYdSxiETXkE4EB1arXi3wt9h7Iq/h7ZmpVL3njaqPGhdZmo9r+c8eZnwD77VIk+pcCB5Yqh3Nu/RaNAMr9hrHfvd62NnYRG3vcdj9aQo3Cshh8tTqzw10B8lCUKrHSbtL8aFzUrZqFilcNWs36mGVnzcLya/TM1uID9z41O47ZDOfZvLkSmGPb44Jwcdt1DK8r60OBdGoHBOa337N7w== noahm@crystalline-entity"
          when "pergolesi.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA71vh3lytStDCr6df5u2tyzk45L7i8QoNysP51+ga6+v8kwMva30zw5fUD6BHYwNfwo1UZzUtsGLE5HTxKuBlfXs+myWjqpjbF3xSpPjbxKZYiLKMpJ5CVC0Mp6f2kSQ5sSC6Ue/etlAqs9D4rgbexo00QlOtBVof+Zolr3SyR6Y/Coo4UCHeFIAf8KQmhKhYEfPsIgsm+IsnpHglqZ8krOm60Fzo/K5xwb2raoVyg73cvBpaST3VGqqlT2+iTKLHUTaWSOvIj99KV6mYBdD4V8CCs3FWrKfM7wlXwBm/LVmr406Ho0QUo1zHZckvUITHtFQW0QwHpaR717fWB5lBz0d9VlQMz2JR7WfzX+iJqTAnVljjFYJIIHBQR8Xr0Z2rkSEjpi1Ar4iPQbYswMMnBQSGhITMPysHqZb75WYg17cubUbDwpiKPCdmDc5/iNoRFOLOW7vwcBISynUweRDDgeZI7sSFydEnIVK+hrLLmI/XZe4ekhZZXQYCc/tllc9kt2qpU8EWlFs0zSnUD/Lj0WOcgiSOJ3pzQWBBN2EHpM2FfdFa+qUhReSbIrWDgqLe9pkJ2emHFDRhBT4r2f85dw9BSUSVpxpA69fYCyZprJUs214Cq+nTZCSzKFfvflJR7VdCmEu0d5Wavf740OQ4gVipQHqydQVW5m4tYDQHR/s= hb@freenet-rz.de aka holger.baust@freenet-ag.de"
-         when "pescetti.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArOaT7YSol/2O0jums0gui3aaycWk8sGz1taDwtQ+UTWzVh0Xn2DGUmBMGvmUVwqY0c7mRI/hOD2BDgvuLv0OQ6guZCLEHnAD4x/bsNucEzSQVEgTywuhans5PxfAGmGWk/thsNcqAE7JjFWGNNR6nj+ZmG299SieNW1wgxCWyQaiju/996yj6YKRN9aT1crNZA+sWi4z51XjPgbX2b55NLWrgmqBX4iSD6bV3nV6LEWXlTZzxUAqJotTD3PF3PWLi5h8kQhAOvT3cG6EkkAQV0TOcZam36x5cPbBek0iDNNQXv1w4fHN6f9qQ2/R5NdF06H91aSmxY7/OZ0XKgYKdw== /home/holgi/.ssh/id_rsa"
          when "pettersson.debian.org" then "from=\"nixon.acc.umu.se\" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwDw56/XK0/uQB+ZIOZIfZ3vpz9zLRuv6G0U4eU4VavqvaL0dXSNhGJLBDLlfpxtJYwYf/mSoK4WZasbbfHxz8jtIxK9c9aGkVA0GKT+xiHWB3J1SlwJaA7S7Ed8nNcG5PNOVd30BD5LimkS53Nz841e+MgZRuL9SfLALq7er03U= root@nixon"
          when "powell.debian.org", "puccini.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAvii/FxkFUlSmn4rIuz1AX6B2INlxYmGo4KW9a1qfXk/foZqO8Igaz/c0nULmaC4KTmwOjzoCp1ujeWlTbQhQTTJb/yMc+SjpPCev70OwigCmyfZrpLienlCDQfPHG69QKXgebydkQK7JkVKNT/mBYDeGYG7K23aCNVu9kLanL/4sDbpdPRBleRlUGV+pzgwSbtwlTyKrkPbr4LzNxkVJbkGPMzWxlALCtrH8jgfnbRqnLn36wJzuIWPuWxARr0D7kBOIQTxxH5TkmXk+XVjDDRsbKuRSOi4qKCknmIDGJyx8xEv1fErpAVgzsE6RLWCSVYoBgfaaIJsH0B4xp9ZPUKjvVbUPHM60zwYZcblsdbx5D6RJ04pihHEf58cfALoqLlHwes62aeqeTsEMmm5OK66tGroFoCmm+301i6QBNX4JrDdHODZixV945Q+X345Nth3kathcDCQB1jXvrXKkFRoMff6QQs+HxXlwAHsR+hkSv0YHbcptcGPZFTXpfsiyQTyPHpJOXZsYqCFz0387z4ldSH+Fmq98g1CVgQkNRF8TYHWNp1+pHnrq+gcT8hqv7JDLQ2X6joGmGBpdWkGBmSrRCVQmWmWK0BiDMxb6Z1ysAdLH6mzEwTg3gh4S0BDVmbRb5YNNVI9y5kBNcbX9c7yuiC7IOEKKV5gZOQ5Jv/0= joerg - debianla, 2010-01-15"
          when "rem.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnHlDow0vUPDbi6OXKAkIV2zFi3xcDQAPLLmWJRY25HKvTLxkHlmXZH6CHrgx5deX4EogK6xWOvjUHdi/RD/BRU9DKFt6mepfGQvJQNeHK44S/yDrmPPWJq/bsCVu1ulOiLxGD4I2ei/4cDhWE5WypRC5Mn9+NOmNZp2kk9IL0UQChOQCXsPsVsch4wsuHns135TSzhH68X2iJK6GkqBeTvMs5DFqf2IbB4iLKASTxQITP1O3HYF4I5hVW9RGQD6i61TPAFKHkeruaMR0c4H7+f+jur9uo3URSTAidylspCST0/qg5xpDAcwDcfLItAtBuILQHyA6NSpBKEWA3zFzemJTDB3E/QEMMRInKJZFIhi08gtnETNxERG1+onss62lVCVn21SMYJQqHNW7GYmVqUlZLUKKUmTaualx0MHO8ODVJg2xzk/X0LWeE/0Nht/cg/DuqqA5DtSqXsw22kNAd+bTMnn0i+gahyCeLVswAhBVKjuLtU9SQXA4GsTxAvDd8rPRtusDI146fvPwgJCXMLStnZvs/22oXVdmMwwWbo5u5qUBqX51AjGI2i3b+JYQJrtBRnR0iNJV1VDiuRhsy48C4wUNRGX+DM78fldpKin5XMsSyEludyh9R7vFFtZMQFCqJelxfgDP5pU+jrxhFKY9rVcHTT0BqgWmpwPHkPs= rmurray@cyberhq

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 843a788..e0ab704 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -178,6 +178,5 @@ geodnssync  geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
 %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-mips   eder,gabrielli=(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

diff --git a/modules/sudo/files/lenny/sudoers b/modules/sudo/files/lenny/sudoers
index 8edaf26..3809ee7 100644 (file)
--- a/modules/sudo/files/lenny/sudoers
+++ b/modules/sudo/files/lenny/sudoers
@@ -177,6 +177,5 @@ geodnssync  geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
 %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-mips   gabrielli=(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