Treat munin-node as an upstart managed service on 14.04

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 6a91bcf5b672460358e06f68a60107371a2d03f1..57013c971184b4e3b542a18b24ea7113e5000b9d 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -64,6 +64,8 @@ default_attributes(
       :lonvia => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
+      :dodobas => { :status => :user },
+      :mhohmann => { :status => :user },
       :ooc => { 
         :status => :role, 
         :members => [ :tomh, :blackadder, :timsc, :ollie ] 
@@ -94,13 +96,11 @@ default_attributes(
   },
   :apt => {
     :sources => [
-      "brightbox-ruby-ng",
-      "ubuntugis-stable", "ubuntugis-unstable",
+      "ubuntugis-stable",
       "mapnik-v210"
     ]
   },
   :dev => {
-    :ruby => "1.9.1",
     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
@@ -127,13 +127,21 @@ default_attributes(
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       },
-      :welcome => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "welcome-2"
+      :jsrouting => {
+        :repository => "git://github.com/systemed/openstreetmap-website.git",
+        :revision => "routing"
+      },
+      :jsrouting2 => {
+        :repository => "git://github.com/jfirebaugh/openstreetmap-website.git",
+        :revision => "routing"
       },
-      :rails4 => {
+      :overpass2 => {
         :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails4"
+        :revision => "overpass"
+      },
+      :comments => {
+        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :revision => "changeset_comments"
       }
     }
   },