From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 3 May 2011 14:06:25 +0000 (+0200)
Subject: Revert "MIT seems to be hammering morricone, making /var fill up."
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=44c29bb6fd1a04c5bbb1eeef4368331cc456b1f4;p=dsa-puppet.git

Revert "MIT seems to be hammering morricone, making /var fill up."

This reverts commit b5db5cc3b55641a5d1b1d35be2e48adc08ed1746.

This rule really is not a good fit for systems that serve debian
archives.  If we need something like this we need to come up with better
or at least different limits.
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index fbb45a46..f5c6f80c 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -154,7 +154,7 @@ class apache2 {
     }
 
     case $hostname {
-        busoni,duarte,holter,lindberg,master,merkel,morricone,powell,rore: {
+        busoni,duarte,holter,lindberg,master,merkel,powell,rore: {
             @ferm::rule { "dsa-http-limit":
                 prio            => "20",
                 description     => "limit HTTP DOS",
@@ -200,7 +200,7 @@ class apache2 {
                 description     => "http subchain",
                 chain           => 'http',
                 rule            => '
-                                    saddr ( 128.30.0.0/16 74.6.22.182 74.6.18.240 67.195.0.0/16 ) jump limit_yahoo;
+                                    saddr ( 74.6.22.182 74.6.18.240 67.195.0.0/16 ) 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;
                                     saddr (66.249.64.0/19) jump limit_google;