Update yevaud role to use new tile setup

diff --git a/roles/tile-old.rb b/roles/tile-old.rb
deleted file mode 100644 (file)
index cc6750c..0000000
--- a/roles/tile-old.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-name "tile-old"
-description "Role applied to all tile servers"
-
-default_attributes(
-  :apt => {
-    :sources => [ "pitti-postgresql" ]
-  },
-  :sysctl => {
-    :sockets => {
-      :comment => "Increase size of connection queue",
-      :parameters => {
-        "net.core.somaxconn" => 10000
-      }
-    }
-  }
-)

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 8432757b1f97409e8a59cf4bb8d6b70e1cd1be58..0489c69d2d902778daeec4270ae44ae7e0a2cc46 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -49,17 +49,32 @@ default_attributes(
       }
     }
   },
+  :postgresql => {
+    :versions => [ "9.1" ],
+    :settings => {
+      :defaults => {
+        :shared_buffers => "3GB",
+        :maintenance_work_mem => "7144MB",
+        :effective_cache_size => "8GB"
+      }
+    }
+  },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024
+        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
       }
     }
+  },
+  :tile => {
+    :tile_directory => "/store/tiles",
+    :node_file => "/store/database/nodes"
   }
-);
+)
 
 run_list(
   "role[ucl-internal]",
-  "role[tile-old]"
+  "role[tile]"
 )