Apply nominatim-standalone role to dulcy

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index aa31fc60bd4d35f71e0a3ea979c2f35dd3fd84ba..df40a0e3312d00b2510f68a6090299735a1f8087 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -26,9 +26,41 @@ default_attributes(
         :hwaddress => "0c:c4:7a:66:96:d3"
       }
     }
+  },
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :shared_buffers => "10GB",
+        :work_mem => "160MB",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB"
+      }
+    }
+  },
+  :nominatim => {
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :database => {
+      :cluster => "9.4/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"
+    },
+    :fpm_pools => {
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "60"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"
+      }
+    }
   }
 )
 
 run_list(
-  "role[ic]"
+  "role[ic]",
+  "role[nominatim-standalone]"
 )

diff --git a/roles/nominatim-standalone.rb b/roles/nominatim-standalone.rb
index 230225fdb7225e4578a78b6c4e721b8797cece9e..98bdee2c783cb9ba0a456050139a541fc71921b2 100644 (file)
--- a/roles/nominatim-standalone.rb
+++ b/roles/nominatim-standalone.rb
@@ -2,13 +2,15 @@ name "nominatim-standalone"
 description "Role applied to all stand-alone nominatim servers"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :postgresql => {
-    :versions => ["9.3"]
+    :versions => ["9.4"]
   },
   :nominatim => {
     :enable_backup => false
   }
-
 )
 
 run_list(