Revert "remove redirect of reverse to poldi"

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index b7740d1df90b100ee84d6cab13794699c2aa0404..508d177a045568d721d721a5e082bed5b807d5be 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -6,9 +6,9 @@ default_attributes(
     :users => {
       :tile => {
         :status => :role,
     :users => {
       :tile => {
         :status => :role,

-        :members => [ :jburgess, :tomh ]
-      },
-    },
+        :members => [:jburgess, :tomh]
+      }
+    }

   },
   :apache => {
     :mpm => "event",
   },
   :apache => {
     :mpm => "event",


@@ -22,11 +22,7 @@ default_attributes(
       :max_requests_per_child => 100000
     }
   },
       :max_requests_per_child => 100000
     }
   },

-  :apt => {
-    :sources => [ "ubuntugis-stable" ]
-  },

   :postgresql => {
   :postgresql => {

-    :versions => [ "9.1" ],

     :settings => {
       :defaults => {
         :temp_buffers => "32MB",
     :settings => {
       :defaults => {
         :temp_buffers => "32MB",


@@ -54,9 +50,6 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :tile => {

-    :database => {
-      :cluster => "9.1/main"
-    },

     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"


@@ -83,7 +76,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v2.18.0",
+        :revision => "v2.31.0",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }