Add unattended upgrades support

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 0aa56aaf40c74e8ed77089ddcad8dfd58bfb7af3..05a65feea8ef188c3274c266efb83e687172ec59 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -8,7 +8,7 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,

-        :members => [ :lonvia, :tomh, :twain ]
+        :members => [:lonvia, :tomh, :twain]

       }
     }
   },
       }
     }
   },


@@ -27,7 +27,7 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",

-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",

         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :autovacuum_max_workers => "1"
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :autovacuum_max_workers => "1"


@@ -64,16 +64,25 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {

-         "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "131072"

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

-    :enabled => true,
-    :repository => "git://git.openstreetmap.org/nominatim.git"
+    :enabled => false,
+    :repository => "git://git.openstreetmap.org/nominatim.git",
+    :tablespaces => {
+      "Osm2pgsql_Data" => "data",
+      "Osm2pgsql_Index" => "data",
+      "Place_Data" => "data",
+      "Place_Index" => "ssd2",
+      "Address_Data" => "data",
+      "Address_Index" => "ssd2",
+      "Search_Data" => "ssd1",
+      "Search_Index" => "ssd1",
+      "Aux_Data" => "aux",
+      "Aux_Index" => "aux"
+    },
+    :redirects => {}

   }
 )
   }
 )

-
-run_list(
-  "recipe[nominatim]"
-)