X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fdynamic.pp;h=4d181d6aa663f2d6913a3dda4d107d36f237c630;hb=5649a4242e4cea08fa81bafc980eed5cdb7e3607;hp=75b3fb9d9ced0c61abb802c6c9411471c250c6dc;hpb=c145ce1571a90464c010a8753b0158e49024193b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/dynamic.pp b/modules/apache2/manifests/dynamic.pp
index 75b3fb9d9..4d181d6aa 100644
--- a/modules/apache2/manifests/dynamic.pp
+++ b/modules/apache2/manifests/dynamic.pp
@@ -1,74 +1,84 @@
 class apache2::dynamic {
-	@ferm::rule { 'dsa-http-limit':
+	ferm::rule { 'dsa-http-limit':
 		prio        => '20',
 		description => 'limit HTTP DOS',
 		chain       => 'http_limit',
+		domain      => '(ip ip6)',
 		rule        => 'mod limit limit-burst 60 limit 15/minute jump ACCEPT;
 		                jump DROP'
 	}
 
-	@ferm::rule { 'dsa-http-soso':
+	ferm::rule { 'dsa-http-soso':
 		prio        => '21',
 		description => 'slow soso spider',
 		chain       => 'limit_sosospider',
+		domain      => '(ip ip6)',
 		rule        => 'mod connlimit connlimit-above 2 connlimit-mask 21 jump DROP;
 		                jump http_limit'
 	}
 
-	@ferm::rule { 'dsa-http-yahoo':
+	ferm::rule { 'dsa-http-yahoo':
 		prio        => '21',
 		description => 'slow yahoo spider',
 		chain       => 'limit_yahoo',
+		domain      => '(ip ip6)',
 		rule        => 'mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP;
 		                jump http_limit'
 	}
 
-	@ferm::rule { 'dsa-http-google':
+	ferm::rule { 'dsa-http-google':
 		prio        => '21',
 		description => 'slow google spider',
 		chain       => 'limit_google',
+		domain      => '(ip ip6)',
 		rule        => 'mod connlimit connlimit-above 2 connlimit-mask 19 jump DROP;
 		                jump http_limit'
 	}
 
-	@ferm::rule { 'dsa-http-bing':
+	ferm::rule { 'dsa-http-bing':
 		prio        => '21',
 		description => 'slow bing spider',
 		chain       => 'limit_bing',
+		domain      => '(ip ip6)',
 		rule        => 'mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP;
 	                  jump http_limit'
 	}
 
-	@ferm::rule { 'dsa-http-baidu':
+	ferm::rule { 'dsa-http-baidu':
 		prio        => '21',
 		description => 'slow baidu spider',
 		chain       => 'limit_baidu',
+		domain      => '(ip ip6)',
 		rule        => 'mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP;
 		                jump http_limit'
 	}
-	@ferm::rule { 'dsa-http-nhn':
+	ferm::rule { 'dsa-http-nhn':
 		prio        => '21',
 		description => 'slow nhn spider',
 		chain       => 'limit_nhn',
+		domain      => '(ip ip6)',
 		rule        => 'mod connlimit connlimit-above 2 connlimit-mask 16 jump DROP;
 		                jump http_limit'
 	}
 
 	if has_role('snapshot_web') {
-		@ferm::rule { 'dsa-http-rules':
+		ferm::rule { 'dsa-http-rules':
 			prio        => '22',
 			description => 'http subchain',
 			chain       => 'http',
+			domain      => '(ip ip6)',
 			rule        => '
-					mod recent name HTTPDOS update seconds 1800 jump log_or_drop;
-					mod hashlimit hashlimit-name HTTPDOS hashlimit-mode srcip hashlimit-burst 30 hashlimit 20/minute jump ACCEPT;
+					mod hashlimit hashlimit-name HTTPDOSPRE hashlimit-mode srcip hashlimit-burst 10 hashlimit 6/minute jump ACCEPT;
+					mod recent name HTTPDOS update seconds 900 jump log_or_drop;
+					mod hashlimit hashlimit-name HTTPDOS hashlimit-mode srcip hashlimit-burst 200 hashlimit 30/minute jump ACCEPT;
 					mod recent name HTTPDOS set jump log_or_drop'
 		}
 	} else {
-		@ferm::rule { 'dsa-http-rules':
+		ferm::rule { 'dsa-http-rules':
 			prio        => '22',
 			description => 'http subchain',
 			chain       => 'http',
+			domain      => '(ip ip6)',
 			rule        => '
 					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;
@@ -83,9 +93,10 @@ class apache2::dynamic {
 		}
 	}
 
-	@ferm::rule { 'dsa-http':
+	ferm::rule { 'dsa-http':
 		prio        => '23',
 		description => 'Allow web access',
+		domain      => '(ip ip6)',
 		rule        => 'proto tcp dport (http https 6081) jump http'
 	}
 }