Switch kalessin, katie, keizer and konqi to squid 4

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index b12b55110346a3265d1148d543cbacc9d4dce143..35c811f3533109f4a61f5fced107590cdfaf3ef2 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,46 +4,49 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.9",
+        :bond => {
+          :slaves => %w[p18p1 p18p2]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "p18p1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "130.117.76.9"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "p18p1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
-      },
-      :internal_ipv4 => {
-        :interface => "p18p2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.179",
-        :hwaddress => "0c:c4:7a:66:96:d3"
+        :address => "2001:978:2:2C::172:9"

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

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

     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",

-        :fsync => "off"
+        :fsync => "on",
+        :effective_io_concurrency => "3"

       }
     }
   },
   :nominatim => {
     :state => "standalone",
     :enable_backup => false,
       }
     }
   },
   :nominatim => {
     :state => "standalone",
     :enable_backup => false,

-    :enable_git_updates => false,
-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.6/main",
+    :enable_git_updates => true,
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "10/main",
+    :postgis => "2.4",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {


@@ -58,19 +61,10 @@ default_attributes(
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
     }
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
     }

-  },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1"
-      }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

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