X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9c69d3d41616820e83728ca063fbf7f62562d932..341683a1e61fd9f3a9436167fbf039418264d493:/roles/ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 00dbc1ab2..aee7655c9 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,92 +2,43 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :ssl => {
-    :certificates => %w(osmfoundation openstreetmap)
-  },
   :apache => {
-    :ssl => {
-      :certificate => "osmfoundation",
-      :certificate_chain => "startcom"
+    :mpm => "event",
+    :event => {
+      :start_servers => 12,
+      :server_limit => 48,
+      :min_spare_threads => 25,
+      :max_spare_threads => 75,
+      :max_connections_per_child => 10000
     }
   },
+  :bind => {
+    :clients => "ucl"
+  },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
-  :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"
-          }
-        }
-      }
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
         :address => "193.60.236.19"
       },
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2801",
         :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"
-        }
-      },
-      :ucl2bm => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "grisu.openstreetmap.org",
-          :port => "1196"
-        }
-      },
-      :firefishy => {
-        :port => "1197",
-        :mode => "client",
-        :peer => {
-          :host => "home.firefishy.com",
-          :port => "1194",
-          :address => "10.0.16.201"
-        }
-      }
-    }
   }
 )
 
 run_list(
-  "role[ucl-slough]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
@@ -96,6 +47,8 @@ run_list(
   "role[blog]",
   "role[otrs]",
   "role[donate]",
+  "recipe[hot]",
+  "recipe[dmca]",
   "recipe[dhcpd]",
-  "recipe[openvpn]"
+  "recipe[ideditor]"
 )