Move cron customisation for tile caches to the tools cookbook

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 09e7a4e6aa9307e7a1a58ccbf18c644ed1da581c..8e177a8ff49ea2781610271c2015f8c0236587d8 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,6 +2,9 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
 description "Master role applied to grisu"
 
 default_attributes(

+  :bind => {
+    :clients => "bytemark"
+  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -10,7 +13,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.20",
         :bond => {
         :family => :inet,
         :address => "10.0.32.20",
         :bond => {

-          :slaves => %w(em1 em2)
+          :slaves => %w[em1 em2]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -43,8 +46,18 @@ default_attributes(
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }

+      },
+      :ucl2bm => {
+        :port => "1196",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }

       }
     }
       }
     }

+  },
+  :planet => {
+    :replication => "disabled"

   }
 )
 
   }
 )
 


@@ -53,6 +66,8 @@ run_list(
   "role[hp-dl180-g6]",
   "role[gateway]",
   "role[web-storage]",
   "role[hp-dl180-g6]",
   "role[gateway]",
   "role[web-storage]",

+  "role[backup]",

   "role[planet]",
   "role[planet]",

+  # "role[planetdump]",

   "recipe[openvpn]"
 )
   "recipe[openvpn]"
 )