X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/caaf3cf37f62bbd311dc0eb43fae8dc582d3626f..5a75898a87099ed06d5ec5c52f7751689d102388:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 108d2ed17..3a838a353 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -71,6 +71,9 @@ default_attributes(
       :stereo => { :status => :user },
       :dmlu => { :status => :user },
       :antonkh => { :status => :user },
+      :gmoncrieff => { :status => :user },
+      :zander => { :status => :user },
+      :msbarry => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -86,6 +89,10 @@ default_attributes(
       :gpsmid => {
         :status => :role,
         :members => [:apmon, :maba]
+      },
+      :"za-imagery" => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]
       }
     }
   },
@@ -110,7 +117,12 @@ default_attributes(
       },
       :tomh => {
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "next"
+        :revision => "next",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "master",
+        :cgimap_options => {
+          :ratelimit_upload => true
+        }
       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",
@@ -126,11 +138,8 @@ default_attributes(
       }
     }
   },
-  :exim => {
-      :smarthost_via => "fafnir.openstreetmap.org:26"
-  },
   :postgresql => {
-    :versions => ["14"],
+    :versions => ["15"],
     :settings => {
       :defaults => {
         :max_connections => "500",
@@ -140,10 +149,9 @@ default_attributes(
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
-      "14" => {
+      "15" => {
         :port => "5432",
-        :wal_level => "logical",
-        :max_replication_slots => "1"
+        :wal_level => "logical"
       }
     }
   },