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 a89e736183c64625564b4f43461160cf34dceb01..57013c971184b4e3b542a18b24ea7113e5000b9d 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -65,6 +65,7 @@ default_attributes(
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :nicolas17 => { :status => :user },
       :zverik => { :status => :user },
       :dodobas => { :status => :user },

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

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


@@ -95,13 +96,11 @@ default_attributes(
   },
   :apt => {
     :sources => [
   },
   :apt => {
     :sources => [

-      "brightbox-ruby-ng",

       "ubuntugis-stable",
       "mapnik-v210"
     ]
   },
   :dev => {
       "ubuntugis-stable",
       "mapnik-v210"
     ]
   },
   :dev => {

-    :ruby => "1.9.1",

     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
     :rails => {
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",


@@ -127,6 +126,22 @@ default_attributes(
       :groups => {
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       :groups => {
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"

+      },
+      :jsrouting => {
+        :repository => "git://github.com/systemed/openstreetmap-website.git",
+        :revision => "routing"
+      },
+      :jsrouting2 => {
+        :repository => "git://github.com/jfirebaugh/openstreetmap-website.git",
+        :revision => "routing"
+      },
+      :overpass2 => {
+        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "overpass"
+      },
+      :comments => {
+        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :revision => "changeset_comments"

       }
     }
   },
       }
     }
   },