apache: relax mod_evasive further

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index ef75b60157d06758dc7a3a5e0f602c8f4f0d3942..f916772268737add51adcddb0c0d2d414bd437d1 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -5,37 +5,43 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
   :apache => {
     :mpm => "event",
     :event => {

-      :max_requests_per_child => 2000
+      :min_spare_threads => 50,
+      :max_spare_threads => 150

     }
   },
     }
   },

+  :hardware => {
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }
+    },
+    :modules => [
+      "it87"
+    ]
+  },
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 250 }
+    }
+  }
+)
+
+override_attributes(

   :networking => {
   :networking => {

+    :dnssec => "false",

     :interfaces => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "89.16.179.150",
-        :prefix => "26",
-        :gateway => "89.16.179.129"
-      },
-      :external_ipv6 => {
+      :external => {

         :interface => "eth0",
         :role => :external,
         :interface => "eth0",
         :role => :external,

-        :family => :inet6,
-        :address => "2001:41c8:0010:0996:21d:7dff:fec3:df70",
-        :prefix => "64",
-        :gateway => "fe80::1"
-      },
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
+        :inet => {
+          :address => "212.110.172.32",
+          :prefix => "26",
+          :gateway => "212.110.172.1"
+        },
+        :inet6 => {
+          :address => "2001:41c9:1:400::32",
+          :prefix => "64",
+          :gateway => "fe80::1"

         }
       }
     }
         }
       }
     }


@@ -44,15 +50,6 @@ default_attributes(
 
 run_list(
   "role[bytemark]",
 
 run_list(
   "role[bytemark]",

-  "role[mail]",

   "role[lists]",
   "role[lists]",

-  "role[git]",
-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "role[dns]",
-  "role[geodns]",
-  "role[chef-repository]",
-  "recipe[openvpn]"
+  "role[osqa]"

 )
 )