Configure katla as a database slave

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index c8e4c76b098f0f43beae7938a3bf399c91f688a1..69eb17ae9ffbdd781d66f3f2d01dd72a50085b5e 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -64,6 +64,7 @@ default_attributes(
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
+      :dodobas => { :status => :user },
       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 
@@ -95,7 +96,7 @@ default_attributes(
   :apt => {
     :sources => [
       "brightbox-ruby-ng",
-      "ubuntugis-stable", "ubuntugis-unstable",
+      "ubuntugis-stable",
       "mapnik-v210"
     ]
   },
@@ -123,17 +124,17 @@ default_attributes(
         :repository => "git://github.com/drolbr/openstreetmap-website.git",
         :revision => "master"
       },
-      :mapui => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "map-ui"
-      },
       :groups => {
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       },
-      :welcome => {
+      :redesign => {
+        :repository => "git://github.com/osmlab/openstreetmap-website.git",
+        :revision => "redesign"
+      },
+      :help => {
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "welcome-2"
+        :revision => "help-page"
       }
     }
   },