move pummelzacken to master version of nominatim

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ec2ac08b62bc4e5bd4da7522d649e8584c592aac..9f63dd0c0e3b295de01339bf8b2b069c6ae9aaac 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -2,9 +2,6 @@ name "pummelzacken"
 description "Master role applied to pummelzacken"
 
 default_attributes(
 description "Master role applied to pummelzacken"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -29,11 +26,13 @@ default_attributes(
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :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",
     :dbadmins => %w(lonvia tomh),
     :dbcluster => "9.5/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",


@@ -48,12 +47,11 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"

-    },
-    :revision => "cmake-port"
+    }

   }
 )
 
 run_list(
   "role[ucl-wolfson]",
   }
 )
 
 run_list(
   "role[ucl-wolfson]",

-  "role[nominatim-base]"
+  "role[nominatim]"

 )
 )