X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/09970bb6b0540589725afa90d9f0514c980ebdc9..808a8a3e8ec7b1903e356f20016e278d012a033e:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index faecec2a1..1da4ad057 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -67,6 +67,8 @@ default_attributes(
       :mhohmann => { :status => :user },
       :enelson => { :status => :user },
       :gregrs => { :status => :user },
+      :stereo => { :status => :user },
+      :dmlu => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -95,57 +97,48 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :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 => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next"
       },
-      :rails6 => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails6"
-      },
       :comments => {
-        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :repository => "https://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       },
       :locale => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "locale"
       },
-      :upload => {
-        :repository => "https://git.openstreetmap.org/public/rails.git",
-        :revision => "master",
-        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
-        :cgimap_revision => "feature/bulk_upload"
+      :microcosms => {
+        :repository => "https://github.com/openbrian/osm-microcosms.git",
+        :revision => "microcosms"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.1", "9.5"],
+    :versions => ["14"],
     :settings => {
       :defaults => {
+        :max_connections => "500",
         :shared_buffers => "1GB",
         :work_mem => "32MB",
         :maintenance_work_mem => "64MB",
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
-      "9.1" => {
-        :port => "5433"
-      },
-      "9.5" => {
-        :port => "5432"
+      "14" => {
+        :port => "5432",
+        :wal_level => "logical",
+        :max_replication_slots => "1"
       }
     }
   },