X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c1c41b65a4d71cd179d95dba87e53a39a34c85c3..68bbe21da0b2f20cb1856fc68f8cbac9c637285d:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index ed6ed2553..1a1e94080 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,82 +4,65 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "p18p1",
-        :role => :external,
-        :family => :inet,
-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
-      },
-      :external_ipv6 => {
-        :interface => "p18p1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
-      },
-      :internal_ipv4 => {
-        :interface => "p18p2",
+      :internal => {
+        :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.179",
-        :hwaddress => "0c:c4:7a:66:96:d3"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => ["9.6"],
-    :settings => {
-      :defaults => {
-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on",
-        :effective_io_concurrency => "3"
-      }
-    }
-  },
-  :nominatim => {
-    :state => "standalone",
-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
-    :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"
-    },
-    :fpm_pools => {
-      :www => {
-        :max_children => "100"
+        :inet => {
+          :address => "10.0.48.9"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp1s0f0 enp1s0f1]
+        }
       },
-      :bulk => {
-        :max_children => "15"
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :inet => {
+          :address => "184.104.179.137"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::9"
+        }
       }
     }
   },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1"
+  :accounts => {
+    :users => {
+      :lonvia => { :status => :administrator },
+      :nominatim => {
+        :status => :role,
+        :members => [:lonvia, :tomh]
       }
     }
   }
+  # :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[ic]",
-  "role[nominatim]"
+  "role[equinix-ams]"
+  # "role[nominatim]"
 )