consolidate settings for nominatim machines

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 056d41c764deb8c38d422d45d696019498b0d940..cd5083c57323878f169a09ecccef8a563bce5b63 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -24,7 +24,7 @@ default[:nominatim][:fpm_pools] = {
 }
 
 default[:nominatim][:config] = {
 }
 
 default[:nominatim][:config] = {

-  :tokenizer => "legacy"
+  :tokenizer => "icu"

 }
 
 default[:nominatim][:redirects] = {}
 }
 
 default[:nominatim][:redirects] = {}

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 29a4548be815eb42a795fc26a8fe252291eee318..b3f864c6a08ad7f3a133d1bed341f0680b5df3a4 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -32,9 +32,6 @@ default_attributes(
     :settings => {
       :defaults => {
         :work_mem => "240MB",
     :settings => {
       :defaults => {
         :work_mem => "240MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",

         :fsync => "on",
         :effective_io_concurrency => "500"
       }
         :fsync => "on",
         :effective_io_concurrency => "500"
       }


@@ -42,28 +39,10 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],

     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :config => {
-      :tokenizer => "icu"
-    },
-    :logdir => "/ssd/nominatim/log",
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
-    }
+    :logdir => "/ssd/nominatim/log"

   }
 )
 
   }
 )
 

diff --git a/roles/longma.rb b/roles/longma.rb
index a8380824ff5238ea156c2e47af00241801e175e8..a22f08a05b65f7eb8a8e79f06acdfc752f8b36ab 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -35,9 +35,6 @@ default_attributes(
     :settings => {
       :defaults => {
         :work_mem => "240MB",
     :settings => {
       :defaults => {
         :work_mem => "240MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",

         :fsync => "off",
         :effective_io_concurrency => "500"
       }
         :fsync => "off",
         :effective_io_concurrency => "500"
       }


@@ -45,28 +42,10 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],

     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :config => {
-      :tokenizer => "icu"
-    },
-    :logdir => "/ssd/nominatim/log",
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
-    }
+    :logdir => "/ssd/nominatim/log"

   }
 )
 
   }
 )
 

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 8981e500ae71aa036bf960222c6582d777716807..49c8a3200b6b99e758a447b4e15402141ab88b56 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -27,7 +27,10 @@ default_attributes(
         :jit => "off",
         :shared_buffers => "2GB",
         :autovacuum_max_workers => "1",
         :jit => "off",
         :shared_buffers => "2GB",
         :autovacuum_max_workers => "1",

-        :max_parallel_workers_per_gather => "0"
+        :max_parallel_workers_per_gather => "0",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB"

       }
     }
   },
       }
     }
   },


@@ -64,7 +67,23 @@ default_attributes(
         "net.netfilter.nf_conntrack_max" => "196608"
       }
     }
         "net.netfilter.nf_conntrack_max" => "196608"
       }
     }

+  },
+  :nominatim => {
+    :dbadmins => %w[lonvia tomh],
+    :tablespaces => {
+      "dosm" => "/ssd/tablespaces/dosm",
+      "iosm" => "/ssd/tablespaces/iosm",
+      "dplace" => "/ssd/tablespaces/dplace",
+      "iplace" => "/ssd/tablespaces/iplace",
+      "daddress" => "/ssd/tablespaces/daddress",
+      "iaddress" => "/ssd/tablespaces/iaddress",
+      "dsearch" => "/ssd/tablespaces/dsearch",
+      "isearch" => "/ssd/tablespaces/isearch",
+      "daux" => "/ssd/tablespaces/daux",
+      "iaux" => "/ssd/tablespaces/iaux"
+    }

   }
   }

+

 )
 
 run_list(
 )
 
 run_list(

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 5ce024ec76e6505c99d40756ac6b2e1b823f33b8..9095e8ffb100cb3693578b1db0798c6120c4d196 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -30,9 +30,6 @@ default_attributes(
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",

         :effective_io_concurrency => "256",
         :fsync => "on"
       }
         :effective_io_concurrency => "256",
         :fsync => "on"
       }


@@ -40,26 +37,10 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
   },
   :nominatim => {
     :state => "standalone",

-    :dbadmins => %w[lonvia tomh],

     :dbcluster => "13/main",
     :postgis => "3",
     :enable_backup => true,
     :dbcluster => "13/main",
     :postgis => "3",
     :enable_backup => true,

-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :config => {
-      :tokenizer => "icu"
-    },
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/data/tablespaces/daux",
-      "iaux" => "/data/tablespaces/iaux"
-    }
+    :flatnode_file => "/ssd/nominatim/nodes.store"

   }
 )
 
   }
 )
 

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 6f947994a90b47db0ca693ad3c4284e912c6d959..b59bf690e9121c78f2cd251d267bf4ebfba4ff1c 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -29,9 +29,6 @@ default_attributes(
     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",

         :fsync => "on",
         :effective_io_concurrency => "100"
       }
         :fsync => "on",
         :effective_io_concurrency => "100"
       }


@@ -39,33 +36,15 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,

     :enable_qa_tiles => true,
     :enable_qa_tiles => true,

-    :dbadmins => %w[lonvia tomh],

     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",

-    :config => {
-      :tokenizer => "icu"
-    },

     :fpm_pools => {
       "nominatim.openstreetmap.org" => {
         :max_children => 100
       }
     :fpm_pools => {
       "nominatim.openstreetmap.org" => {
         :max_children => 100
       }

-    },
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"

     }
   }
 )
     }
   }
 )