Fix php requires and reapply nominatim role to dulcy

[chef.git] / roles / nominatim-slave.rb

diff --git a/roles/nominatim-slave.rb b/roles/nominatim-slave.rb
index a161d90cd17d0ebf5481c931f42108c883beacc7..0ef9a9f51233fc72459a3c4684e285596d34a7b5 100644 (file)
--- a/roles/nominatim-slave.rb
+++ b/roles/nominatim-slave.rb
@@ -7,23 +7,17 @@ default_attributes(
       :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"
+        :standby_mode => "on"
       }
     }
   },
   :nominatim => {
+    :state => "slave",
     :enable_backup => false
   }
 )
 
 run_list(
-  "role[nominatim]",
-  "recipe[nominatim::slave]"
+  "recipe[nominatim::slave]",
+  "role[nominatim-base]"
 )