Make sure cgimap uses the writable database for updates

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index bd0cb806574fa6b662158b426be04affc479079f..be3a48e3f3954443c5a7b5cb6493a9524514a29c 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -10,7 +10,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 => {


@@ -30,21 +30,31 @@ default_attributes(
   :openvpn => {
     :address => "10.0.16.5",
     :tunnels => {
   :openvpn => {
     :address => "10.0.16.5",
     :tunnels => {

-      :aws2bm => {
+      :ic2bm => {

         :port => "1194",
         :mode => "server",
         :peer => {
           :host => "ironbelly.openstreetmap.org"
         }
       },
         :port => "1194",
         :mode => "server",
         :peer => {
           :host => "ironbelly.openstreetmap.org"
         }
       },

-      :ic2bm => {
+      :aws2bm => {

         :port => "1195",
         :mode => "server",
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }
         :port => "1195",
         :mode => "server",
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }

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

       }
     }
       }
     }

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

   }
 )
 
   }
 )
 


@@ -53,6 +63,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]"
 )