Use pfifo_fast as the default queuing discipline

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ec2ac08b62bc4e5bd4da7522d649e8584c592aac..2280a94726c4c0dc90d418053d5bb1e45ce79115 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -2,40 +2,40 @@ name "pummelzacken"
 description "Master role applied to pummelzacken"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "em1",
+        :interface => "em1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
-        :interface => "em2",
+        :interface => "em1.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.204"
+        :address => "193.60.236.18"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.5/main",
+    :state => "standalone",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "9.6/main",
+    :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
@@ -49,11 +49,15 @@ default_attributes(
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
     },
-    :revision => "cmake-port"
+    :fpm_pools => {
+      :www => {
+        :max_children => "40"
+      }
+    }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim-base]"
+  "role[ucl]",
+  "role[nominatim]"
 )