From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 16 Aug 2010 10:29:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5f9b6e60800eeff29318662b84404dc0d23283dc;hp=-c;p=dsa-puppet.git

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:
  slow down some more search spiders
  move all files to explicit new-style module/ paths
  and apache module
  convert exim module to new syntax - why it needs to change, I don't know
  these settings seem to break samhain on wolkenstein - how odd
  ignore bind stuff on geo servers as well
  libdns66 can be ignored as well - pesky sonames
  The geo's no longer have a local geoip set of packages
---

5f9b6e60800eeff29318662b84404dc0d23283dc
diff --combined modules/ferm/manifests/per-host.pp
index 0990a1a6,3d474588..ec082c38
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@@ -111,7 -111,7 +111,7 @@@ class ferm::per-host 
  	cilea: {
              file {
                  "/etc/ferm/conf.d/load_sip_conntrack.conf":
-                     source => "puppet:///ferm/conntrack_sip.conf",
+                     source => "puppet:///modules/ferm/conntrack_sip.conf",
                      require => Package["ferm"],
                      notify  => Exec["ferm restart"];
              }
@@@ -208,16 -208,6 +208,16 @@@
                  rule            => 'proto tcp daddr 193.62.202.28 dport 80 REDIRECT to-ports 6081',
              }
          }
 +        stabile: {
 +            @ferm::rule { "dsa-snapshot-varnish":
 +                rule            => '&SERVICE(tcp, 6081)',
 +            }
 +            @ferm::rule { "dsa-nat-snapshot-varnish":
 +                table           => 'nat',
 +                chain           => 'PREROUTING',
 +                rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
 +            }
 +        }
      }
  }