Remove nominatim role from dulcy

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 9ef7d15c8f861ddb00de3de8b0be853ff21b388f..1a1e940808c249b810719cf4cd6f98c734314e1a 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -14,7 +14,7 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[ens18f0 ens18f1]
+          :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
       :external => {
@@ -29,32 +29,40 @@ default_attributes(
       }
     }
   },
-  :postgresql => {
-    :versions => ["14"],
-    :settings => {
-      :defaults => {
-        :work_mem => "240MB",
-        :fsync => "on",
-        :effective_io_concurrency => "500"
+  :accounts => {
+    :users => {
+      :lonvia => { :status => :administrator },
+      :nominatim => {
+        :status => :role,
+        :members => [:lonvia, :tomh]
       }
     }
-  },
-  :nominatim => {
-    :state => "standalone",
-    :dbcluster => "14/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"
-    }
   }
+  # :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]"
 )