Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/apache2/manifests/dynamic.pp b/modules/apache2/manifests/dynamic.pp
index f5a357f..3a790b2 100644 (file)
--- a/modules/apache2/manifests/dynamic.pp
+++ b/modules/apache2/manifests/dynamic.pp
@@ -3,6 +3,7 @@ class apache2::dynamic {
                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'
        }
@@ -11,6 +12,7 @@ class apache2::dynamic {
                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'
        }
@@ -19,6 +21,7 @@ class apache2::dynamic {
                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'
        }
@@ -27,6 +30,7 @@ class apache2::dynamic {
                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'
        }
@@ -35,6 +39,7 @@ class apache2::dynamic {
                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'
        }
@@ -43,6 +48,7 @@ class apache2::dynamic {
                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'
        }
@@ -50,31 +56,47 @@ class apache2::dynamic {
                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'
        }
 
-       @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',
+                       domain      => '(ip ip6)',
+                       rule        => '
+                                       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':
+                       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;
+                                       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':
                prio        => '23',
                description => 'Allow web access',
-               rule        => 'proto tcp dport (http https) jump http'
+               domain      => '(ip ip6)',
+               rule        => 'proto tcp dport (http https 6081) jump http'
        }
 }