X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fdynamic.pp;h=f5a357f3d0b0e9de9bc90d15b322ca8ab2a5bc91;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=0b4b144d5d9017bcdf6b47d07d3df85fc7d2c233;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/dynamic.pp b/modules/apache2/manifests/dynamic.pp
index 0b4b144d5..f5a357f3d 100644
--- 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 ( 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 (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;