Drop ascalon role

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e1a2a3ddc2463570b4d5a402e9dc20cb8bea6aeb..fca0d8ee0a29d035fda6a9efbbabb2c83f2f7a3a 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 => {


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

-        :checkpoint_segments => "32",

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

-        :autovacuum_max_workers => "1"
+        :jit => "off",
+        :shared_buffers => "2GB",
+        :autovacuum_max_workers => "1",
+        :max_parallel_workers_per_gather => "0",
+        :maintenance_work_mem => "10GB",
+        :seq_page_cost => "3.0",
+        :random_page_cost => "3.0",
+        :effective_cache_size => "60GB",
+        :wal_level => "minimal",
+        :max_wal_senders => "0"

       }
     }
   },
       }
     }
   },


@@ -42,13 +44,6 @@ default_attributes(
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
     },
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
     },

-    :kernel_scheduler_tune => {
-      :comment => "Tune kernel scheduler preempt",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    },

     :swappiness => {
       :comment => "Reduce swap usage",
       :parameters => {
     :swappiness => {
       :comment => "Reduce swap usage",
       :parameters => {


@@ -64,28 +59,15 @@ 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 => {
       }
     }
   },
   :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"
-    }
+    :dbadmins => %w[lonvia tomh]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )