Use separate apt source list template for nginx

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index ecf8b907e9a8eed0625ccd67f104ee8a9391f88d..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 },
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },

+      :dodobas => { :status => :user },

       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 
       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 


@@ -95,7 +96,7 @@ default_attributes(
   :apt => {
     :sources => [
       "brightbox-ruby-ng",
   :apt => {
     :sources => [
       "brightbox-ruby-ng",

-      "ubuntugis-stable", "ubuntugis-unstable",
+      "ubuntugis-stable",

       "mapnik-v210"
     ]
   },
       "mapnik-v210"
     ]
   },


@@ -123,9 +124,17 @@ default_attributes(
         :repository => "git://github.com/drolbr/openstreetmap-website.git",
         :revision => "master"
       },
         :repository => "git://github.com/drolbr/openstreetmap-website.git",
         :revision => "master"
       },

-      :mapui => {
+      :groups => {

         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :repository => "git://github.com/osmlab/openstreetmap-website.git",

-        :revision => "map-ui"
+        :revision => "groups-sketch"
+      },
+      :redesign => {
+        :repository => "git://github.com/osmlab/openstreetmap-website.git",
+        :revision => "redesign"
+      },
+      :help => {
+        :repository => "git://github.com/osmlab/openstreetmap-website.git",
+        :revision => "help-page"

       }
     }
   },
       }
     }
   },