Merge remote-tracking branch 'github/pull/587'

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 08093d90dfabb3fc1006f25de9dde35dae88327c..7a653f422be9eb0e63fc8a42f1dffe3acd8027f8 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,72 +2,34 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :dhcpd =>{
-    :first_address => "10.0.15.1",
-    :last_address => "10.0.15.254"
-  },
-  :exim => {
-    :aliases => {
-      :root => "grant"
+  :apache => {
+    :mpm => "event",
+    :event => {
+      :start_servers => 12,
+      :server_limit => 48,
+      :min_spare_threads => 25,
+      :max_spare_threads => 75,
+      :max_connections_per_child => 10000
     }
   },
-  :munin => {
-    :graphs => {
-      :apcpdu_ucl => {
-        :title => "Current for UCL",
-        :vlabel => "Amps",
-        :category => "Ups",
-        :values => {
-          :load => {
-            :sum => [ "apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load" ],
-            :label => "Load"
-          }
-        }
-      }
-    }
+  :dhcpd => {
+    :first_address => "10.0.15.1",
+    :last_address => "10.0.15.254"
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
+      :external => {
+        :interface => "eth0.2800",
         :role => :external,
-        :family => :inet,
-        :address => "128.40.168.102"
-      },
-      :internal_ipv4 => {
-        :interface => "eth1",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.3"
-      },
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.1",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "client",
-        :peer => {
-          :host => "ironbelly.openstreetmap.org",
-          :port => "1194"
-        }
-      },
-      :shenron2ucl => {
-        :port => "1195",
-        :mode => "client",
-        :peer => {
-          :host => "shenron.openstreetmap.org",
-          :port => "1194"
+        :inet => {
+          :address => "193.60.236.19"
         }
       },
-      :firefishy => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "home.firefishy.com",
-          :port => "1194",
-          :address => "10.0.16.201"
+      :internal => {
+        :interface => "eth0.2801",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.0.3"
         }
       }
     }
@@ -75,14 +37,14 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl]",
+  "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
-  "role[switch2osm]",
   "role[blog]",
   "role[otrs]",
-  "role[thinkup]",
-  "recipe[dhcpd]",
-  "recipe[openvpn]"
+  "role[donate]",
+  "recipe[dmca]",
+  "recipe[dhcpd]"
 )