Update default SSL cipher list and remove tilecache override

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 119bac8948cf833a4548e045f15c06a12eab1a95..cad14d6fdc3cc3ddcde63768dcd7a5e6f0d3f533 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -17,11 +17,50 @@ default_attributes(
         :role => :external,
         :family => :inet6,
         :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
         :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"
+      }
+    }
+  },
+  :postgresql => {
+    :versions => ["9.4"],
+    :settings => {
+      :defaults => {
+        :work_mem => "300MB",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB",
+        :fsync => "on"
+      }
+    }
+  },
+  :nominatim => {
+    :enabled => false,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log",
+    :database => {
+      :cluster => "9.4/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"
+    }
+  },
+  :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[ic]",
+  "role[nominatim-standalone]"

 )
 )