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

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 9a1093fb2dcceeb9413800c7fad4d9a07767bdc7..7250ce893c72039cc4b74d3331bc10d83813d5b3 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,15 +2,19 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

+  :ssl => {
+    :certificates => %w(osmfoundation openstreetmap)
+  },
+  :apache => {
+    :ssl => {
+      :certificate => "osmfoundation",
+      :certificate_chain => "startcom"
+    }
+  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },

-  :exim => {
-    :aliases => {
-      :root => "grant"
-    }
-  },

   :munin => {
     :graphs => {
       :apcpdu_ucl => {
   :munin => {
     :graphs => {
       :apcpdu_ucl => {


@@ -19,7 +23,7 @@ default_attributes(
         :category => "Ups",
         :values => {
           :load => {
         :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"
           }
         }
             :label => "Load"
           }
         }


@@ -29,13 +33,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.205"
+        :address => "193.60.236.19"

       },
       :internal_ipv4 => {
       },
       :internal_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"


@@ -61,9 +65,17 @@ default_attributes(
           :port => "1194"
         }
       },
           :port => "1194"
         }
       },

-      :firefishy => {
+      :ucl2bm => {

         :port => "1196",
         :mode => "client",
         :port => "1196",
         :mode => "client",

+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1196"
+        }
+      },
+      :firefishy => {
+        :port => "1197",
+        :mode => "client",

         :peer => {
           :host => "home.firefishy.com",
           :port => "1194",
         :peer => {
           :host => "home.firefishy.com",
           :port => "1194",


@@ -75,15 +87,15 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-wolfson]",
-  "role[hp-g6]",
+  "role[ucl]",
+  "role[hp-dl360-g6]",

   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[switch2osm]",
   "role[blog]",
   "role[otrs]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[switch2osm]",
   "role[blog]",
   "role[otrs]",

-  "role[thinkup]",
+  "role[donate]",

   "recipe[dhcpd]",
   "recipe[openvpn]"
 )
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )