Track backport branches of osm2pgsql git on irc

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 3be0a2e6dd4188301e8052209f7381d5fc15a80d..bc73e1d55341fc7e097efdb48c1ba337972b75b9 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -2,6 +2,9 @@ name "orm"
 description "Master role applied to orm"
 
 default_attributes(
 description "Master role applied to orm"
 
 default_attributes(

+  :apt => {
+    :sources => ["postgresql"]
+  },

   :devices => {
     :ssd_samsung => {
       :comment => "Tune scheduler for SSD",
   :devices => {
     :ssd_samsung => {
       :comment => "Tune scheduler for SSD",


@@ -43,7 +46,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.1"],
+    :versions => ["9.5"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -62,6 +65,9 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :tile => {

+    :database => {
+      :cluster => "9.5/main"
+    },

     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {