Add support for private mediawiki sites

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index c8e4c76b098f0f43beae7938a3bf399c91f688a1..a30d18f3cf5cd6beda9118aa37e96ac4f17683de 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 },
       :lonvia => { :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 ] 


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

-      "brightbox-ruby-ng",
-      "ubuntugis-stable", "ubuntugis-unstable",
+      "ubuntugis-stable",

       "mapnik-v210"
     ]
   },
   :dev => {
       "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",


@@ -119,26 +119,22 @@ default_attributes(
         :repository => "git://github.com/ppawel/openstreetmap-website.git",
         :revision => "owl-history-tab"
       },
         :repository => "git://github.com/ppawel/openstreetmap-website.git",
         :revision => "owl-history-tab"
       },

-      :overpass => {
-        :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"
       },
       :groups => {
         :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"

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

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

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


@@ -149,6 +145,9 @@ default_attributes(
       },
       "9.1" => {
         :port => "5433"
       },
       "9.1" => {
         :port => "5433"

+      },
+      "9.3" => {
+        :port => "5432"

       }
     }
   },
       }
     }
   },