Remove some redundant settings from chef server configuration

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index e15bf775f69cab26fb42dcb401ac6510f522d3fd..eca0fa2cf3c7ab9b9490bc607c4ec18d00fbca97 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,29 +2,58 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
-  :location => "Carlton, Victoria, Australia",
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "138.44.68.106",
-        :prefix => "30",
-        :gateway => "138.44.68.105",
-        :mtu => 9000,
+        :inet => {
+          :address => "138.44.68.106",
+          :prefix => "30",
+          :gateway => "138.44.68.105"
+        },
         :bond => {
-          :slaves => %w[ens14f0 ens14f1]
+          :slaves => %w[ens14f0np0 ens14f1np1]
         }
       }
+    }
+  },
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :effective_cache_size => "16GB"
+      }
+    }
+  },
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
+      }
+    }
+  },
+  :tile => {
+    :database => {
+      :cluster => "16/main",
+      :postgis => "3"
     },
-    :nameservers => [
-      "202.158.207.1",
-      "202.158.207.2"
-    ]
+    :mapnik => "3.1",
+    :replication => {
+      :directory => "/store/replication"
+    },
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 run_list(
-  "role[aarnet]"
+  "role[aarnet]",
+  "role[tile]"
 )