Switch piasa to use postgres 16

[chef.git] / roles / stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 7850adf1657adc50cbc7bfeff216267b9c7d29e1..88b0568e81ae8473b0a5d86a5b3cf2eb96f2853b 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -7,47 +7,45 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "140.211.167.100",
+        :inet => {
+          :address => "140.211.167.100"
+        },
+        :inet6 => {
+          :address => "2605:bc80:3010:700::8cd3:a764"
+        },
         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
-      },
-      :external_ipv6 => {
-        :interface => "bond0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2605:bc80:3010:700::8cd3:a764"
       }
     }
   },
-  :squid => {
-    :version => 4,
-    :cache_mem => "32768 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "65536M"
+  :postgresql => {
+    :versions => ["15"],
+    :settings => {
+      :defaults => {
+        :work_mem => "300MB",
+        :fsync => "on",
+        :effective_io_concurrency => "100"
       }
     }
   },
-  :tilecache => {
-    :tile_parent => "corvallis.render.openstreetmap.org"
+  :nominatim => {
+    :state => "standalone",
+    :dbcluster => "15/main",
+    :postgis => "3",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_flavour => "python",
+    :api_workers => 18,
+    :api_pool_size => 8
   }
 )
 
 run_list(
   "role[osuosl]",
   "role[hp-g9]",
-  "role[tilecache]"
+  "role[geodns]",
+  "role[nominatim]"
 )