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

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 1a1e940808c249b810719cf4cd6f98c734314e1a..420522c593d99f348cb2533ba7a0b063f79860b1 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -29,40 +29,25 @@ default_attributes(
       }
     }
   },
-  :accounts => {
-    :users => {
-      :lonvia => { :status => :administrator },
-      :nominatim => {
-        :status => :role,
-        :members => [:lonvia, :tomh]
+  :postgresql => {
+    :versions => ["17"],
+    :settings => {
+      :defaults => {
+        :work_mem => "240MB",
+        :effective_io_concurrency => "500"
       }
     }
+  },
+  :nominatim => {
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :enable_qa_tiles => true,
+    :api_workers => 14,
+    :api_pool_size => 10
   }
-  # :postgresql => {
-  #   :versions => ["15"],
-  #   :settings => {
-  #     :defaults => {
-  #       :work_mem => "240MB",
-  #       :effective_io_concurrency => "500"
-  #     }
-  #   }
-  # },
-  # :nominatim => {
-  #   :state => "standalone",
-  #   :dbcluster => "15/main",
-  #   :postgis => "3",
-  #   :flatnode_file => "/ssd/nominatim/nodes.store",
-  #   :logdir => "/ssd/nominatim/log",
-  #   :api_flavour => "python",
-  #   :api_workers => 14,
-  #   :api_pool_size => 10,
-  #   :config => {
-  #     :forward_dependencies => "yes"
-  #   }
-  # }
 )
 
 run_list(
-  "role[equinix-ams]"
-  # "role[nominatim]"
+  "role[equinix-ams]",
+  "role[nominatim]"
 )