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: (21 commits)
  Revert "pettersson has bpo acpid"
  Revert "pettersson has bpo acpid"
  pettersson has bpo acpid
  mayer has new kernel and linux-base now
  new-ftp-master starts with a firewall
  Add franck.debian.org
  update authorized_keys
  and an rsync rule
  BT seeding should be on v6 as well
  a few powell  specific rules
  powell gets ferm
  add limit_bing rule
  paer now has linux-base
  all hosts have root: debian-admin@d.o in /etc/aliases, we don't need it here
  add %porter-mips
  quote link target
  add kill link
  and enable monit from inittab: what could go wrong?
  define init q command
  spurious whitespace change
  ...

diff --git a/manifests/site.pp b/manifests/site.pp
index a5d96b4..2ebe52d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -91,7 +91,7 @@ node default {
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky: { include ferm }
+        franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky: { include ferm }
     }
     case $hostname {
         zandonai,zelenka: {
@@ -146,6 +146,21 @@ node default {
                    rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V6)"
           }
         }
+       powell: {
+          @ferm::rule { "dsa-powell-v6-tunnel":
+                   description     => "Allow powell to use V6 tunnel broker",
+                   rule            => "proto ipv6 saddr 212.227.117.6 jump ACCEPT"
+          }
+          @ferm::rule { "dsa-powell-btseed":
+                    domain          => "(ip ip6)",
+                   description     => "Allow powell to seed BT",
+                   rule            => "proto tcp dport 8000:8100 jump ACCEPT"
+          }
+           @ferm::rule { "dsa-powell-rsync":
+                    description     => "Hoster wants to sync from here, and why not",
+                    rule            => "&SERVICE_RANGE(tcp, rsync, ( 195.20.242.90 192.25.206.33 82.195.75.106 206.12.19.118 ))"
+           }
+       }
        beethoven: {
           @ferm::rule { "dsa-merikanto-beethoven":
                    description     => "Allow merikanto",  # for nfs, and that uses all kind of ports by default.

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 4098660..22a2107 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -152,10 +152,15 @@ class apache2 {
         description     => "slow yahoo spider",
         rule            => "chain 'limit_yahoo' { mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP; jump http_limit; }"
     }
+    @ferm::rule { "dsa-http-bing":
+        prio            => "21",
+        description     => "slow bing spider",
+        rule            => "chain 'limit_bing' { mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP; jump http_limit; }"
+    }
     @ferm::rule { "dsa-http-rules":
         prio            => "22",
         description     => "http subchain",
-        rule            => "chain 'http' { saddr ( 74.6.22.182 74.6.18.240 ) jump limit_yahoo; saddr 124.115.0.0/21 jump limit_sosospider; mod recent name HTTPDOS update seconds 1800 jump log_or_drop; mod hashlimit hashlimit-name HTTPDOS hashlimit-mode srcip hashlimit-burst 600 hashlimit 30/minute jump ACCEPT; mod recent name HTTPDOS set jump log_or_drop; }"
+        rule            => "chain 'http' { saddr ( 74.6.22.182 74.6.18.240 ) jump limit_yahoo; saddr 124.115.0.0/21 jump limit_sosospider; saddr (65.52.0.0/14 207.46.0.0/16) jump limit_bing; mod recent name HTTPDOS update seconds 1800 jump log_or_drop; mod hashlimit hashlimit-name HTTPDOS hashlimit-mode srcip hashlimit-burst 600 hashlimit 30/minute jump ACCEPT; mod recent name HTTPDOS set jump log_or_drop; }"
     }
     @ferm::rule { "dsa-http":
         prio            => "23",

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 4ee2c28..5edef0d 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -144,6 +144,8 @@ class debian-org {
         "procps restart":
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
+        "init q":
+            refreshonly => true;
     }
 }
 

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index daa37af..1c356ce 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -26,6 +26,7 @@ nameinfo:
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
+  franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
   gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 – July 10th, 1690)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index ca1210f..945c25a 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -117,7 +117,7 @@ domainlist handled_domains = +local_domains : +virtual_domains : +bsmtp_domains
 
 localpartlist local_only_users = lsearch;/etc/exim4/localusers
 
-localpartlist postmasterish = postmaster : abuse : hostmaster : root
+localpartlist postmasterish = postmaster : abuse : hostmaster
 
 hostlist debianhosts = 127.0.0.1 : /var/lib/misc/thishost/debianhosts
 

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index cad4319..1fcbf89 100644 (file)
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,7 +1,24 @@
 class monit {
     package { "monit": ensure => installed }
 
+    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\"",
+                   ],
+        onlyif => "match mo size == 0",
+        notify => Exec["init q"],
+    }
+
+
     file {
+        "/etc/rc2.d/K99monit":
+          ensure  => "../init.d/monit";
+
+        "/etc/rc2.d/S99monit":
+          ensure  => absent;
+
         "/etc/monit/":
           ensure  => directory,
           owner   => root,
@@ -13,7 +30,7 @@ class monit {
         "/etc/monit/monitrc":
           content => template("monit/monitrc.erb"),
           require => Package["monit"],
-          notify  => Exec["monit restart"],
+          notify  => Exec["monit stop"],
           mode    => 400
           ;
 
@@ -28,24 +45,24 @@ class monit {
         "/etc/monit/monit.d/01puppet":
           source  => "puppet:///monit/puppet",
           require => Package["monit"],
-          notify  => Exec["monit restart"],
+          notify  => Exec["monit stop"],
           mode    => 440
           ;
 
         "/etc/monit/monit.d/00debian.org":
           source  => "puppet:///monit/debianorg",
           require => Package["monit"],
-          notify  => Exec["monit restart"],
+          notify  => Exec["monit stop"],
           mode    => 440
           ;
 
         "/etc/default/monit":
           content => template("monit/default.erb"),
           require => Package["monit"],
-          notify  => Exec["monit restart"]
+          notify  => Exec["monit stop"]
           ;
     }
-    exec { "monit restart":
+    exec { "monit stop":
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }

diff --git a/modules/monit/templates/default.erb b/modules/monit/templates/default.erb
index d89d326..95ec992 100644 (file)
--- a/modules/monit/templates/default.erb
+++ b/modules/monit/templates/default.erb
@@ -10,6 +10,7 @@
 
 # You must set this variable to for monit to start
 startup=1
+
 <% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
 <% else %>
 

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index d8031b7..e6423a0 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -6,18 +6,18 @@
 <%=
 ignore = []
 case fqdn
-when /(bellini|cimarosa).debian.org/: ignore << "mcelog"
-when "busoni.debian.org":             ignore << %w{libthreads-perl libthreads-shared-perl}
-when /draghi.debian.org/:             ignore << %w{userdir-ldap libnet-dns-perl libnet-dns-sec-perl libnet-dns-zone-parser-perl libdns-ruby1.8}
-when /geo[123].debian.org/:           ignore << %w{geoip-database libgeoip1 geoip-bin}
-when /liszt.debian.org/:              ignore << "amavisd-new"
-when /stabile.debian.org/:            ignore << "xfsprogs"
-when /(zandonai|zelenka).debian.org/: ignore << %w{zabbix-agent rrdcollect}
+when /(bellini|cimarosa).debian.org/:   ignore << "mcelog"
+when "busoni.debian.org":               ignore << %w{libthreads-perl libthreads-shared-perl}
+when /draghi.debian.org/:               ignore << %w{userdir-ldap libnet-dns-perl libnet-dns-sec-perl libnet-dns-zone-parser-perl libdns-ruby1.8}
+when /geo[123].debian.org/:             ignore << %w{geoip-database libgeoip1 geoip-bin}
+when /liszt.debian.org/:                ignore << "amavisd-new"
+when /stabile.debian.org/:              ignore << "xfsprogs"
+when /(zandonai|zelenka).debian.org/:   ignore << %w{zabbix-agent rrdcollect}
 when /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm"
-when /(lebrun|schroeder).debian.org/: ignore << "firmware-linux-nonfree"
-when /(peri|penalosa).debian.org/:    ignore << "linux-base"
-when "powell.debian.org":             ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
-when "zee.debian.org":                ignore << %w{dpkg-dev dpkg}
+when /(lebrun|schroeder).debian.org/:   ignore << "firmware-linux-nonfree"
+when /(mayer|paer|peri|penalosa).debian.org/: ignore << "linux-base"
+when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
+when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
 end
 
 case fqdn

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index cc74fbe..d00b392 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -30,8 +30,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1zy2/qSBpYaOKYVEnDI+KEiQlPiKsTv96zJeNdu7xLY1
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuWUv0xRqmnrYX/7b80HIAY9s80Qp4QRFH3DXEkuyDeprJC+GdJs2S/fwhWI9eZDF8NN03SLoOg9q7lXoy2Ts6tda8zfqIf/IBnvcqbsoCtbmrOTvwHj5fVFh0fw72KSc8b+Bccs+1aLXUqP2eSKXB9jpR+apUd7DQ0i6si2/fwrQvqXZ71NeRkcSXIuED9PCA2298DKob1tCAXP1XSIswxxgHdGZgVHYhNt33XSM7zksTbMjr7NBZkJOcgk3dLOVz2RSo38+Curv8nPVoD4uIsE551GXnNTPZiMosvDY3Cy3gTwBhpXFxtkRDr0jMQpYj+ahQ3F+MFJr+0S89QeHfQ== Martin Zobel-Helas - debian adm key (2010-01-04) 
 # weasel
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAqtZYwCwuLP2KZOfqdRyKbexfhcfEiwY7en7aYmY7eUxa396Nzhxv1KOl2xpatD40/TPHtU+GUMxa0PLM7Tn5j2HxZ5S/bjp2l881EWJlYUzZjL95e/PBhPM2r6/VvLTHI7dFI+2s2/LDIuRn3dKsIxFncRzZRjPrpks14wpII4UpVTwQSrBMwkweq0anUiUtw/y7s33fSQJKYu7gXkmkm7mtuF8PJnvI6j482pu34GxWGjjSs9f7ZAm2+mXviVedAsrN3E4MgK14Z6+lOIxfgWmZ2gz33u2nbJ5TCTGJYyxbkaYXXLKo8JW2GtcCZchmhw4kUzo0rfRIXI80e4FEeh3Tj2X0518xp7m/SvKa2nE/dcye2a77ruJZJ0tzHqUmXZSMT5ZdOqgIxeqLGksNFK1mPUbMsfkxbCANVLp17CIeqUtiMYfOjzCuKc3GdYe8Mp47dQx824hnfEldJw9dWH8d+ELO64UsQnEIleQt+d2ASdFK0Vc2SmG7gxcFa2OU9V8TAWx/HKhBhW5KkMKUagATYLgbqzMRfgqslJFDJxB8fQ++Xlodq20MTt2TM9L89ilKyzmG/tNawR71l8+U/sxJS6/sVVXCzHLlMEyVnYRZMBeNwiW2ZBjM+mTv300vUS7+iNUOaZasPOMJqV3d4ImgRUMcOmExMDAnHCRGS10= Peter Palfrader - debian adm key (2008-05-11)
-# sgran
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAl6d3j4CiqkNNPv328Dy0zmWE8z8+pDvyRIpMk9wi2ojEmWvfv9spgUX/hUL0h9GXOjeuAJaSD45+GuWKNM0AKaa8KCdTOrKle1lpmH6Uk/tjZZwrR8ujMN95/XNpCc3/pZBnRBKOQhZr5+Du4v0ZtLp90EkgAXC11dGxaVe05O/RV1+Tix0WtUO+sBDmirMRjbk0ADCk6ANupKypNtMhlb8HP2OZA1QzrDtCc+yb/CQIOwMFIwFXrdX4P1Jsh8QG5YrO10wu8ckxC7lN1yiwJ92ISefAihk1n1/a1kMzvbCkyO7muGb4KuLPWspeZ31YhmeSiZe36sNNPMURrIfU/n0nuTtLR1OHZ87FIyuo/fTGNMnsIUgxxKZEuHz5PzrRsCpqRvMOrk4J30tjnWtcyYJAQknW8rDfa66wlMziyzJqRDJq96NmZwWpmHH4xTtecnX2s5p27sxNjzG2BKFvGziqPb3pqkzZUnys3dIQxSXfF42VwkWjHJJkRqLidVOrnedpvMMQuu+qcTKVtsA4nYAA+b6Qm4XPLqpR/esgji/pzE+0vG+H+cx7uZlobzZxKGoIoFAir514VtBr/rETAsTwlKHRa2DvN5suOGU1lO7RYGh/cQvDDOSHcamsbBeWYDYK0pqSojus7nwdn8FfNEThfkumWJOTD9dZEF20Lu0= sgran's Debian adm key (2009-08-02)
 
 <%= machine_keys = case fqdn
    when "bartok.debian.org", "beethoven.debian.org" then

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index cfc0472..d0d0534 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -147,6 +147,7 @@ geodnssync  geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
 %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-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