Move db-slave and nominatim-slave roles to public repository

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index a0d9f0e90a3de04b165753cb8bf2e6958c92c70b..d94b29a0eef075d3bdc6714090dc53f51f64f181 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -64,16 +64,25 @@ node[:postgresql][:versions].each do |version|
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 
-  restore_command = settings[:restore_command] || defaults[:restore_command]
   standby_mode = settings[:standby_mode] || defaults[:standby_mode]
+  primary_conninfo = settings[:primary_conninfo] || defaults[:primary_conninfo]
+  restore_command = settings[:restore_command] || defaults[:restore_command]
 
   if restore_command || standby_mode == "on"
+    passwords = if primary_conninfo
+                  data_bag_item(primary_conninfo[:passwords][:bag],
+                                primary_conninfo[:passwords][:item])
+                end
+
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       source "recovery.conf.erb"
       owner "postgres"
       group "postgres"
       mode 0640
-      variables :defaults => defaults, :settings => settings
+      variables :standby_mode => standby_mode,
+                :primary_conninfo => primary_conninfo,
+                :restore_command => restore_command,
+                :passwords => passwords
       notifies :reload, "service[postgresql]"
     end
   else

diff --git a/cookbooks/postgresql/templates/default/recovery.conf.erb b/cookbooks/postgresql/templates/default/recovery.conf.erb
index f7628906c919f2dc276d502187c3b81c0bba8392..00f6eab9d7dd23fc209ee5fc91cb461724ea4337 100644 (file)
--- a/cookbooks/postgresql/templates/default/recovery.conf.erb
+++ b/cookbooks/postgresql/templates/default/recovery.conf.erb
@@ -1,9 +1,9 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-standby_mode = <%= @settings[:standby_mode] || @defaults[:standby_mode] %>
-<% if @settings[:primary_conninfo] || @defaults[:primary_conninfo] -%>
-primary_conninfo = '<%= @settings[:primary_conninfo] || @defaults[:primary_conninfo] %>'
+standby_mode = <%= @standby_mode %>
+<% if @primary_conninfo -%>
+primary_conninfo = 'host=<%= @primary_conninfo[:host] %> port=<%= @primary_conninfo[:port] %> user=<%= @primary_conninfo[:user] %> password=<%= @passwords[@primary_conninfo[:user]] %>'
 <% end -%>
-<% if @settings[:restore_command] || @defaults[:restore_command] -%>
-restore_command = '<%= @settings[:restore_command] || @defaults[:restore_command] %>'
+<% if @restore_command -%>
+restore_command = '<%= @restore_command %>'
 <% end -%>

diff --git a/roles/db-slave.rb b/roles/db-slave.rb
new file mode 100644 (file)
index 0000000..cdc828d
--- /dev/null
+++ b/roles/db-slave.rb
@@ -0,0 +1,27 @@
+name "db-slave"
+description "Role applied to all slave database servers"
+
+default_attributes(
+  :postgresql => {
+    :versions => ["9.1"],
+    :settings => {
+      :defaults => {
+        :hot_standby => "on",
+        :hot_standby_feedback => "on",
+        :standby_mode => "on",
+        :primary_conninfo => {
+          :host => "katla",
+          :port => "5432",
+          :user => "replication",
+          :passwords => { :bag => "db", :item => "passwords" }
+        },
+        :restore_command => "/usr/bin/rsync katla::archive/%f %p"
+      }
+    }
+  }
+)
+
+run_list(
+  "role[db]",
+  "recipe[db::slave]"
+)

diff --git a/roles/nominatim-slave.rb b/roles/nominatim-slave.rb
new file mode 100644 (file)
index 0000000..3175a95
--- /dev/null
+++ b/roles/nominatim-slave.rb
@@ -0,0 +1,31 @@
+name "nominatim-slave"
+description "Role applied to all slave nominatim servers"
+
+default_attributes(
+  :postgresql => {
+    :versions => ["9.3"],
+    :settings => {
+      :defaults => {
+        :hot_standby => "on",
+        :hot_standby_feedback => "on",
+        :standby_mode => "on",
+        :primary_conninfo => {
+          :host => "pummelzacken.ucl.openstreetmap.org",
+          :port => "5432",
+          :user => "replication",
+          :passwords => { :bag => "nominatim", :item => "passwords" }
+        },
+        :restore_command => "/usr/bin/rsync pummelzacken.ucl.openstreetmap.org::archive/%f %p"
+      }
+    }
+  },
+  :nominatim => {
+    :enable_backup => false
+  }
+
+)
+
+run_list(
+  "role[nominatim]",
+  "recipe[nominatim::slave]"
+)