Fix for rubocop

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index fef91998d0270171b975692462ffba958a9db019..d3244ea8869be1793c9ca07bcbede563e2ef0710 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,15 +2,19 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :dhcpd =>{
-    :first_address => "10.0.15.1",
-    :last_address => "10.0.15.254"
+  :ssl => {
+    :certificates => %w(osmfoundation openstreetmap)
   },
-  :exim => {
-    :aliases => {
-      :root => "grant"
+  :apache => {
+    :ssl => {
+      :certificate => "osmfoundation",
+      :certificate_chain => "startcom"
     }
   },
+  :dhcpd => {
+    :first_address => "10.0.15.1",
+    :last_address => "10.0.15.254"
+  },
   :munin => {
     :graphs => {
       :apcpdu_ucl => {
@@ -19,7 +23,7 @@ default_attributes(
         :category => "Ups",
         :values => {
           :load => {
-            :sum => [ "apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load" ],
+            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],
             :label => "Load"
           }
         }
@@ -39,7 +43,7 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
-      },
+      }
     }
   },
   :openvpn => {
@@ -61,9 +65,17 @@ default_attributes(
           :port => "1194"
         }
       },
-      :firefishy => {
+      :ucl2bm => {
         :port => "1196",
         :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1196"
+        }
+      },
+      :firefishy => {
+        :port => "1197",
+        :mode => "client",
         :peer => {
           :host => "home.firefishy.com",
           :port => "1194",
@@ -76,13 +88,14 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
+  "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[switch2osm]",
   "role[blog]",
   "role[otrs]",
-  "role[thinkup]",
+  "role[donate]",
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )