From: Stephen Gran <steve@lobefin.net>
Date: Mon, 16 Aug 2010 07:12:10 +0000 (+0100)
Subject: slow down some more search spiders
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8bf7a67029f55b8a1a72c09ab367dd53161aec15;p=mirror%2Fdsa-puppet.git

slow down some more search spiders

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index fde10b9d9..c72e2b57b 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -148,7 +148,7 @@ class apache2 {
     }
     @ferm::rule { "dsa-http-soso":
         prio            => "21",
-        description     => "slow yahoo spider",
+        description     => "slow soso spider",
         chain           => 'limit_sosospider',
         rule            => '
                             mod connlimit connlimit-above 2 connlimit-mask 21 jump DROP;
@@ -164,6 +164,15 @@ class apache2 {
                             jump http_limit;
                            '
     }
+    @ferm::rule { "dsa-http-google":
+        prio            => "21",
+        description     => "slow google spider",
+        chain           => 'limit_google',
+        rule            => '
+                            mod connlimit connlimit-above 2 connlimit-mask 19 jump DROP;
+                            jump http_limit;
+                           '
+    }
     @ferm::rule { "dsa-http-bing":
         prio            => "21",
         description     => "slow bing spider",
@@ -178,9 +187,10 @@ class apache2 {
         description     => "http subchain",
         chain           => 'http',
         rule            => '
-                            saddr ( 74.6.22.182 74.6.18.240 ) 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;
 
                             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;