Bump cookstyle from 7.30.4 to 7.31.1

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index ef75b60157d06758dc7a3a5e0f602c8f4f0d3942..9e94e5edd97d70853a52000695a58c053ff4f271 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -5,40 +5,47 @@ default_attributes(
   :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]
+      }
+    },
+    :mcelog => {
+      :enabled => false
+    },
+    :modules => [
+      "it87"
+    ]
+  }
+)
+
+override_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,
-        :address => "89.16.179.150",
+        :address => "212.110.172.32",
         :prefix => "26",
-        :gateway => "89.16.179.129"
+        :gateway => "212.110.172.1"
       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
-        :address => "2001:41c8:0010:0996:21d:7dff:fec3:df70",
+        :address => "2001:41c9:1:400::32",
         :prefix => "64",
         :gateway => "fe80::1"
-      },
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
       }
-    }
+    },
+    :nameservers => ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"],
+    :private_address => "10.0.16.100"
   }
 )
 
@@ -46,13 +53,9 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
-  "role[git]",
   "role[subversion]",
   "role[trac]",
   "role[osqa]",
   "role[irc]",
-  "role[dns]",
-  "role[geodns]",
-  "role[chef-repository]",
-  "recipe[openvpn]"
+  "recipe[blogs]"
 )