Allow new UCL addresses to access the log archive

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 041cd0e13c8d3b7c7d13860d7a71dfcfda03f5b4..4a7d40e06fedc63e40d8f717ddd753a4821c6545 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,5 +1,5 @@
 name "nominatim"
 name "nominatim"

-description "Role applied to all nominatim servers"
+description "Role applied to all nominatim servers."

 
 default_attributes(
   :accounts => {
 
 default_attributes(
   :accounts => {


@@ -18,10 +18,13 @@ default_attributes(
     :keepalive => false,
     :event => {
       :server_limit => 32,
     :keepalive => false,
     :event => {
       :server_limit => 32,

-      :max_clients => 1600,
+      :max_request_workers => 1600,

       :threads_per_child => 50
     }
   },
       :threads_per_child => 50
     }
   },

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

   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {


@@ -68,39 +71,9 @@ default_attributes(
         "net.netfilter.nf_conntrack_max" => "131072"
       }
     }
         "net.netfilter.nf_conntrack_max" => "131072"
       }
     }

-  },
-  :nominatim => {
-    :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"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      },
-      :details => {
-        :port => "8002",
-        :pm => "static",
-        :max_children => "2"
-      }
-    },
-    :redirects => {}

   }
 )
   }
 )

+
+run_list(
+  "recipe[nominatim::default]"
+)