Pass authentication headers to cgimap so that it can handle OAuth.

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index b15c5f0133673e79bdd46df7e7ac18082d6199a3..76d2df6421d566215e0c9a44a0e6adccf9b299a3 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -26,25 +26,27 @@ default_attributes(
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :dbadmins => ["lonvia", "tomh"],
+    :state => "standalone",
+    :dbadmins => %w(lonvia tomh),
     :dbcluster => "9.5/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :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"
+      "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"
     },
     :revision => "cmake-port"
   }
@@ -52,5 +54,5 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
-  "role[nominatim-base]"
+  "role[nominatim]"
 )