remove account confirmation for private wikis

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 7c4cd919c7dc911e4603614b0557953207770c77..b3f864c6a08ad7f3a133d1bed341f0680b5df3a4 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -10,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {

-          :slaves => %w[p18p1 p18p2]
+          :slaves => %w[ens18f0 ens18f1]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -28,43 +28,25 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["10"],
+    :versions => ["14"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "off",
-        :effective_io_concurrency => "3"
+        :work_mem => "240MB",
+        :fsync => "on",
+        :effective_io_concurrency => "500"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

-    :state => "off",
-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "10/main",
-    :postgis => "2.4",
+    :state => "standalone",
+    :dbcluster => "14/main",
+    :postgis => "3",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :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"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )