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

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index a3e67e0f0bb112d1370941aabe8bf12d0ddd05d2..81a7f34d2e8fb598284472c094553fb90aeb301a 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -94,8 +94,8 @@ default_attributes(
         :members => [:apmon, :maba]
       },
       :"za-imagery" => {
         :members => [:apmon, :maba]
       },
       :"za-imagery" => {

-          :status => :role,
-          :members => [:grant, :htonl, :gmoncrieff, :zander]
+        :status => :role,
+        :members => [:grant, :htonl, :gmoncrieff, :zander]

       }
     }
   },
       }
     }
   },


@@ -116,7 +116,7 @@ default_attributes(
         :revision => "master",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "master",
         :revision => "master",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "master",

-        :aliases => ["api06.dev.openstreetmap.org"]
+        :aliases => ["master.apis.dev.osm.org", "api06.dev.openstreetmap.org", "api06.dev.osm.org"]

       },
       :tomh => {
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
       },
       :tomh => {
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",