X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/217064420664ee23151c357cf59a3ca0ce82c4cf..15c5f64e3607c5d84383af0f8a08137f3fb8a9f6:/roles/dev.rb?ds=inline

diff --git a/roles/dev.rb b/roles/dev.rb
index 3c9ae8196..6a55e650d 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -5,7 +5,7 @@ default_attributes(
   :accounts => {
     :users => {
       :edgemaster => { :status => :administrator },
-      :emacsen => { :status => :administrator },
+      :emacsen => { :status => :user },
       :twain => { :status => :user },
       :bretth => { :status => :user },
       :richard => { :status => :user },
@@ -58,6 +58,7 @@ default_attributes(
       :cobra => { :status => :user },
       :ppawel => { :status => :user },
       :simon04 => { :status => :user },
+      :jeslop => { :status => :user },
       :jfire => { :status => :user },
       :malenki => { :status => :user },
       :lonvia => { :status => :user },
@@ -69,6 +70,10 @@ default_attributes(
       :gregrs => { :status => :user },
       :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]
@@ -84,6 +89,10 @@ default_attributes(
       :gpsmid => {
         :status => :role,
         :members => [:apmon, :maba]
+      },
+      :"za-imagery" => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]
       }
     }
   },
@@ -121,23 +130,11 @@ default_attributes(
       :microcosms => {
         :repository => "https://github.com/openbrian/osm-microcosms.git",
         :revision => "microcosms"
-      },
-      :upload => {
-        :repository => "https://git.openstreetmap.org/public/rails.git",
-        :revision => "master",
-        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
-        :cgimap_revision => "feature/bulk_upload"
-      },
-      :argon2 => {
-        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "argon2",
-        :cgimap_repository => "https://github.com/mmd-osm/openstreetmap-cgimap.git",
-        :cgimap_revision => "feature/argon2"
       }
     }
   },
   :postgresql => {
-    :versions => ["14"],
+    :versions => ["15"],
     :settings => {
       :defaults => {
         :max_connections => "500",
@@ -147,10 +144,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"
       }
     }
   },
@@ -162,6 +158,9 @@ default_attributes(
         "kernel.shmmax" => "17179869184"
       }
     }
+  },
+  :openssh => {
+    :password_authentication => true
   }
 )