Switch site back to online mode

[chef.git] / roles / balerion.rb

diff --git a/roles/balerion.rb b/roles/balerion.rb
index 749a046455dec94c7ce5008905fc84a0edce2985..56b88cc39198b8c3c34245874a563e0298028047 100644 (file)
--- a/roles/balerion.rb
+++ b/roles/balerion.rb
@@ -12,26 +12,47 @@ default_attributes(
         :prefix => "30",
         :gateway => "138.44.68.133",
         :bond => {
         :prefix => "30",
         :gateway => "138.44.68.133",
         :bond => {

-          :slaves => %w[ens14f0 ens14f1]
+          :slaves => %w[ens14f0np0 ens14f1np1]

         }
       }
     }
   },
         }
       }
     }
   },

-  :squid => {
-    :cache_mem => "32000 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :shared_buffers => "8GB",
+        :maintenance_work_mem => "7144MB",
+        :effective_cache_size => "16GB"
+      }
+    }

   },
   },

-  :tilecache => {
-    :tile_parent => "melbourne.render.openstreetmap.org",
-    :tile_siblings => [
-      "waima.openstreetmap.org",
-      "tuatara.openstreetmap.org",
-      "longma.openstreetmap.org"
-    ]
+  :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 => "14/main",
+      :postgis => "3"
+    },
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }

   }
 )
 
 run_list(
   "role[aarnet]",
   }
 )
 
 run_list(
   "role[aarnet]",

-  "role[tilecache]"
+  "role[geodns]",
+  "role[tile]"

 )
 )