Fix php requires and reapply nominatim role to dulcy

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

diff --git a/roles/nominatim-master.rb b/roles/nominatim-master.rb
index e54179fd70b59c158b286740b70786b959253420..1961d835cab74960dc71885663419e72b6b32ba5 100644 (file)
--- a/roles/nominatim-master.rb
+++ b/roles/nominatim-master.rb
@@ -3,43 +3,36 @@ description "Role applied to the master nominatim server"
 
 default_attributes(
   :postgresql => {
-    :versions => ["9.3"],
     :settings => {
       :defaults => {
-        :listen_addresses => "*",
         :wal_level => "hot_standby",
         :archive_mode => "on",
         :archive_command => "/bin/cp %p /data/postgresql-archive/%f",
-        :max_wal_senders => "1",
-        :late_authentication_rules => [
-          { :database => "replication", :user => "replication", :address => "146.179.159.164/32" }
-        ]
+        :max_wal_senders => "5"
       }
     }
   },
   :nominatim => {
+    :state => "master",
     :enable_backup => true
   },
   :rsyncd => {
     :modules => {
       :archive => {
         :comment => "WAL Archive",
-        :path => "/data/postgresql-archive",
         :read_only => true,
         :write_only => false,
         :list => false,
         :uid => "postgres",
         :gid => "postgres",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "146.179.159.164"
-        ]
+        :transfer_logging => false
       }
     }
   }
 )
 
 run_list(
-  "role[nominatim]",
-  "recipe[rsyncd]"
+  "recipe[rsyncd]",
+  "recipe[nominatim::master]",
+  "role[nominatim-base]"
 )