Bump cookstyle from 7.25.6 to 7.25.8

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e1a2a3ddc2463570b4d5a402e9dc20cb8bea6aeb..e9c6040c910b999809e52ba6f0cf926d0a75fb15 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,25 +1,19 @@
 name "nominatim"
 name "nominatim"

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

 
 default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },
 
 default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },

-      :twain => { :status => :administrator },

       :nominatim => {
         :status => :role,
       :nominatim => {
         :status => :role,

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

       }
     }
   },
       }
     }
   },

-  :apache => {
-    :mpm => "event",
-    :timeout => 60,
-    :keepalive => false,
-    :event => {
-      :server_limit => 32,
-      :max_clients => 1600,
-      :threads_per_child => 50
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"

     }
   },
   :postgresql => {
     }
   },
   :postgresql => {


@@ -30,6 +24,8 @@ default_attributes(
         :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",

+        :jit => "off",
+        :shared_buffers => "2GB",

         :autovacuum_max_workers => "1"
       }
     }
         :autovacuum_max_workers => "1"
       }
     }


@@ -64,28 +60,12 @@ 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" => "196608"

       }
     }
       }
     }

-  },
-  :nominatim => {
-    :enabled => true,
-    :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"
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "recipe[nominatim]"
+  "recipe[nominatim::default]"

 )
 )