Bump kitchen-dokken from 2.10.0 to 2.11.0

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index faecec2a19e4c6eeaa07d5b9790d1d5370ed3c81..703cbccf204cd54f8e34e29af8b9549922612352 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -67,6 +67,8 @@ default_attributes(
       :mhohmann => { :status => :user },
       :enelson => { :status => :user },
       :gregrs => { :status => :user },
       :mhohmann => { :status => :user },
       :enelson => { :status => :user },
       :gregrs => { :status => :user },

+      :stereo => { :status => :user },
+      :dmlu => { :status => :user },

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


@@ -95,44 +97,41 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
       :max_connections_per_child => 10000
     }
   },

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :dev => {
     :rails => {
       :master => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
   :dev => {
     :rails => {
       :master => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",

-        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",

         :cgimap_revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },
       :tomh => {
         :cgimap_revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },
       :tomh => {

-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",

         :revision => "next"
       },
         :revision => "next"
       },

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

       :comments => {
       :comments => {

-        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :repository => "https://github.com/ukasiu/openstreetmap-website.git",

         :revision => "comments_list"
       },
       :locale => {
         :revision => "comments_list"
       },
       :locale => {

-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",

         :revision => "locale"
       },
         :revision => "locale"
       },

+      :microcosms => {
+        :repository => "https://github.com/openbrian/osm-microcosms.git",
+        :revision => "microcosms"
+      },

       :upload => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
       :upload => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",

-        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",

         :cgimap_revision => "feature/bulk_upload"
       }
     }
   },
   :postgresql => {
         :cgimap_revision => "feature/bulk_upload"
       }
     }
   },
   :postgresql => {

-    :versions => ["9.1", "9.5"],
+    :versions => ["9.1", "12"],

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


@@ -144,7 +143,7 @@ default_attributes(
       "9.1" => {
         :port => "5433"
       },
       "9.1" => {
         :port => "5433"
       },

-      "9.5" => {
+      "12" => {

         :port => "5432"
       }
     }
         :port => "5432"
       }
     }