Merge remote-tracking branch 'github/pull/467'

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 52c9694af57c6cedce7a78ed15ab1b8de996e707..8981e500ae71aa036bf960222c6582d777716807 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -5,32 +5,15 @@ default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },
   :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,
-    :reqtimeout => true,
-    :event => {
-      :server_limit => 46,
-      :max_request_workers => 2400,
-      :threads_per_child => 50,
-      :min_spare_threads => 125,
-      :max_spare_threads => 925
-    }
-  },
-  :apt => {
-    :sources => ["postgresql"]
-  },

   :networking => {
     :firewall => {
   :networking => {
     :firewall => {

-      :http_rate_limit => "s:7/sec:15"
+      :http_rate_limit => "s:2/sec:15"

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


@@ -41,8 +24,10 @@ 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",
         :shared_buffers => "2GB",

-        :autovacuum_max_workers => "1"
+        :autovacuum_max_workers => "1",
+        :max_parallel_workers_per_gather => "0"

       }
     }
   },
       }
     }
   },


@@ -76,7 +61,7 @@ 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"

       }
     }
   }
       }
     }
   }