From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 1 Jun 2018 16:02:36 +0000 (+0200)
Subject: snapshot_web dynamic rules
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c145ce1571a90464c010a8753b0158e49024193b

snapshot_web dynamic rules
---

diff --git a/modules/apache2/manifests/dynamic.pp b/modules/apache2/manifests/dynamic.pp
index a07347a16..75b3fb9d9 100644
--- a/modules/apache2/manifests/dynamic.pp
+++ b/modules/apache2/manifests/dynamic.pp
@@ -54,22 +54,33 @@ class apache2::dynamic {
 		                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 220.181.0.0/16) jump limit_baidu;
-		                saddr (119.235.237.024) jump limit_nhn;
+	if has_role('snapshot_web') {
+		@ferm::rule { 'dsa-http-rules':
+			prio        => '22',
+			description => 'http subchain',
+			chain       => 'http',
+			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 recent name HTTPDOS set jump log_or_drop'
+		}
+	} else {
+		@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 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 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;
-		                mod recent name HTTPDOS set jump log_or_drop'
+					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;
+					mod recent name HTTPDOS set jump log_or_drop'
+		}
 	}
 
 	@ferm::rule { 'dsa-http':