Stop fight chef-server over configuration file permissions

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 3e4ca83cde92ec273ad009859e64a22d5d28c16d..9f63dd0c0e3b295de01339bf8b2b069c6ae9aaac 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,29 +19,39 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.3"],
+    :versions => ["9.5"],

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",

-        :effective_cache_size => "60GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

+    :state => "standalone",
+    :dbadmins => %w(lonvia tomh),
+    :dbcluster => "9.5/main",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :redirects => {
+    :tablespaces => {
+      "dosm" => "/ssd/tablespaces/dosm",
+      "iosm" => "/ssd/tablespaces/iosm",
+      "dplace" => "/ssd/tablespaces/dplace",
+      "iplace" => "/ssd/tablespaces/iplace",
+      "daddress" => "/ssd/tablespaces/daddress",
+      "iaddress" => "/ssd/tablespaces/iaddress",
+      "dsearch" => "/ssd/tablespaces/dsearch",
+      "isearch" => "/ssd/tablespaces/isearch",
+      "daux" => "/data/tablespaces/daux",
+      "iaux" => "/data/tablespaces/iaux"

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ucl-wolfson]"
+  "role[ucl-wolfson]",
+  "role[nominatim]"

 )
 )