try apache rate limiting on snapshot hosts

[mirror/dsa-puppet.git] / modules / apache2 / manifests / dynamic.pp

diff --git a/modules/apache2/manifests/dynamic.pp b/modules/apache2/manifests/dynamic.pp
index df81ef2..a07347a 100644 (file)
--- a/modules/apache2/manifests/dynamic.pp
+++ b/modules/apache2/manifests/dynamic.pp
@@ -46,17 +46,26 @@ class apache2::dynamic {
                rule        => 'mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP;
                                jump http_limit'
        }
+       @ferm::rule { 'dsa-http-nhn':
+               prio        => '21',
+               description => 'slow nhn spider',
+               chain       => 'limit_nhn',
+               rule        => 'mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP;
+                               jump http_limit'
+       }
 
        @ferm::rule { 'dsa-http-rules':
                prio        => '22',
                description => 'http subchain',
                chain       => 'http',
                rule        => '
+                               saddr (82.195.75.113) jump ACCEPT;
                                saddr (74.6.22.182 74.6.18.240 67.195.0.0/16) jump limit_yahoo;
                                saddr (124.115.0.0/21 119.63.192.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;
-                               saddr (123.125.71.0/24 119.63.192.0/21 180.76.0.0/16) jump limit_baidu;
+                               saddr (123.125.71.0/24 119.63.192.0/21 180.76.0.0/16 220.181.0.0/16) jump limit_baidu;
+                               saddr (119.235.237.024) jump limit_nhn;
 
                                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;
@@ -66,6 +75,6 @@ class apache2::dynamic {
        @ferm::rule { 'dsa-http':
                prio        => '23',
                description => 'Allow web access',
-               rule        => 'proto tcp dport (http https) jump http'
+               rule        => 'proto tcp dport (http https 6081) jump http'
        }
 }