Fix backup expiry script to match prefixes correctly

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index abe2780ff958e076fb32686e478e331a51356c4e..b0c49764760cedc693dd47db40335034557b3424 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -47,12 +47,12 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "12/main",
+      :cluster => "14/main",

       :postgis => "3"
     },
       :postgis => "3"
     },

+    :mapnik => "3.1",

     :styles => {
       :default => {
     :styles => {
       :default => {

-        :revision => "v5.0.0",

         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]


@@ -62,6 +62,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[tile]"
 )
   "role[tile]"
 )