X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b6bfcebb6947656b9be5a4c888df9245bcef8cbe..252f39e174aa5f88b1ddb5896e593fcc3818ed40:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index c884e2b21..5ab242997 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -22,9 +22,6 @@ default_attributes(
       :threads_per_child => 50
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :postgresql => {
     :settings => {
       :defaults => {
@@ -51,10 +48,29 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
     }
   },
   :nominatim => {
-    :repository => "git://git.openstreetmap.org/nominatim.git"
+    :enabled => true,
+    :repository => "git://git.openstreetmap.org/nominatim.git",
+    :tablespaces => {
+        "Osm2pgsql_Data" => "aux",
+        "Osm2pgsql_Index" => "data",
+        "Place_Data" => "ssd2",
+        "Place_Index" => "ssd1",
+        "Address_Data" => "ssd2",
+        "Address_Index" => "ssd1",
+        "Search_Data" => "ssd1",
+        "Search_Index" => "ssd1",
+        "Aux_Data" => "aux",
+        "Aux_Index" => "aux",
+    }
   }
 )