Merge remote-tracking branch 'github/pull/688'

diff --git a/roles/cloudferro-waw3-2.rb b/roles/cloudferro-waw3-2.rb
new file mode 100644 (file)
index 0000000..9c9d8b0
--- /dev/null
+++ b/roles/cloudferro-waw3-2.rb
@@ -0,0 +1,11 @@
+name "cloudferro-waw3-2"
+description "Role applied to all servers at CloudFerro WAW3-2"
+
+run_list(
+  "role[pl]",
+  "role[cloudferro]"
+)
+
+default_attributes(
+  :location => "Warsaw"
+)

diff --git a/roles/cloudferro.rb b/roles/cloudferro.rb
new file mode 100644 (file)
index 0000000..52b5d2d
--- /dev/null
+++ b/roles/cloudferro.rb
@@ -0,0 +1,6 @@
+name "cloudferro"
+description "Role applied to all servers at Cloudferro"
+
+default_attributes(
+  :hosted_by => "CloudFerro"
+)

diff --git a/roles/wawel.rb b/roles/wawel.rb
new file mode 100644 (file)
index 0000000..e29ac63
--- /dev/null
+++ b/roles/wawel.rb
@@ -0,0 +1,40 @@
+name "wawel"
+description "Master role applied to wawel"
+
+default_attributes(
+  :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"
+    },
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }
+  }
+)
+
+run_list(
+  "role[cloudferro-waw3-2]",
+  "role[tile]"
+)