Use osmfoundation certificate for the blog

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 84ca09be9f3895c24823f2d3fb64f7269bea43f6..faf7adda323a2e1926387c9c950abd94eb6a8553 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -68,19 +68,19 @@ default_attributes(
       :mhohmann => { :status => :user },
       :ooc => {
         :status => :role,
       :mhohmann => { :status => :user },
       :ooc => {
         :status => :role,

-        :members => [ :tomh, :blackadder, :timsc, :ollie ]
+        :members => [:tomh, :blackadder, :timsc, :ollie]

       },
       :apis => {
         :status => :role,
       },
       :apis => {
         :status => :role,

-        :members => [ :tomh ]
+        :members => [:tomh]

       },
       :os => {
         :status => :role,
       },
       :os => {
         :status => :role,

-        :members => [ :tomh, :grant, :ollie ]
+        :members => [:tomh, :grant, :ollie]

       },
       :gpsmid => {
         :status => :role,
       },
       :gpsmid => {
         :status => :role,

-        :members => [ :apmon, :maba ]
+        :members => [:apmon, :maba]

       }
     }
   },
       }
     }
   },


@@ -99,11 +99,7 @@ default_attributes(
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
         :revision => "master",
       :master => {
         :repository => "git://git.openstreetmap.org/rails.git",
         :revision => "master",

-        :aliases => [ "api06.dev.openstreetmap.org" ]
-      },
-      :routing => {
-        :repository => "git://github.com/apmon/openstreetmap-website.git",
-        :revision => "routing2"
+        :aliases => ["api06.dev.openstreetmap.org"]

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


@@ -117,22 +113,17 @@ default_attributes(
         :repository => "git://github.com/osmlab/openstreetmap-website.git",
         :revision => "groups-sketch"
       },
         :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"
-      },

       :comments => {
         :repository => "git://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       }
     }
   },
       :comments => {
         :repository => "git://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       }
     }
   },

+  :passenger => {
+    :ruby_version => "2.1"
+  },

   :postgresql => {
   :postgresql => {

-    :versions => [ "9.1", "9.3" ],
+    :versions => ["9.1", "9.3"],

     :settings => {
       :defaults => {
         :shared_buffers => "1GB",
     :settings => {
       :defaults => {
         :shared_buffers => "1GB",