X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c539edca301fde6201f8d7f53e5310f1219789f1..b7c12630cb9de017d76fe60ff296534d6d061399:/roles/dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 672c5e022..f85849e88 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -4,71 +4,79 @@ description "Role applied to all development servers"
 default_attributes(
   :accounts => {
     :users => {
-      :edgemaster => { :status => :administrator },
-      :emacsen => { :status => :administrator },
-      :twain => { :status => :user },
-      :bretth => { :status => :user },
-      :richard => { :status => :user },
-      :shaunmcdonald => { :status => :user },
-      :random => { :status => :user },
-      :steve8 => { :status => :user },
+      :ant => { :status => :user },
+      :antonkh => { :status => :user },
+      :apmon => { :status => :user },
       :blackadder => { :status => :user },
-      :timsc => { :status => :user },
       :bobkare => { :status => :user },
+      :bretth => { :status => :user },
+      :bsupnik => { :status => :user },
+      :chippy => { :status => :user },
+      :cobra => { :status => :user },
+      :contrapunctus => { :status => :user },
+      :csmale => { :status => :user },
+      :dan => { :status => :user },
       :daveh => { :status => :user },
-      :gravitystorm => { :status => :user },
-      :fred => { :status => :user },
-      :nick => { :status => :user },
+      :davidearl => { :status => :user },
       :deelkar => { :status => :user },
-      :simone => { :status => :user },
-      :mitjak => { :status => :user },
+      :derick => { :status => :user },
+      :dmlu => { :status => :user },
+      :dodobas => { :status => :user },
+      :edgemaster => { :status => :administrator },
+      :emacsen => { :status => :user },
+      :enelson => { :status => :user },
+      :fred => { :status => :user },
+      :gmoncrieff => { :status => :user },
+      :gravitystorm => { :status => :user },
+      :gregory => { :status => :user },
+      :gregrs => { :status => :user },
+      :harrywood => { :status => :user },
       :htonl => { :status => :user },
-      :russ => { :status => :user },
-      :merio => { :status => :user },
-      :chippy => { :status => :user },
+      :jeslop => { :status => :user },
+      :jfire => { :status => :user },
+      :jgc => { :status => :user },
       :joerichards => { :status => :user },
-      :pafciu17 => { :status => :user },
-      :ojw => { :status => :user },
-      :harrywood => { :status => :user },
-      :yellowbkpk => { :status => :user },
-      :apmon => { :status => :user },
-      :mackerski => { :status => :user },
+      :joshd => { :status => :user },
       :ldp => { :status => :user },
+      :lfrancke => { :status => :user },
+      :ligfietser => { :status => :user },
+      :lonvia => { :status => :user },
+      :maba => { :status => :user },
+      :mackerski => { :status => :user },
+      :malenki => { :status => :user },
       :mdaines => { :status => :user },
-      :dan => { :status => :user },
-      :ris => { :status => :user },
+      :merio => { :status => :user },
+      :mhohmann => { :status => :user },
+      :milliams => { :status => :user },
+      :mitjak => { :status => :user },
+      :msbarry => { :status => :user },
+      :mvexel => { :status => :user },
+      :nick => { :status => :user },
+      :nicolas17 => { :status => :user },
       :nroets => { :status => :user },
+      :ojw => { :status => :user },
       :ollie => { :status => :user },
-      :mvexel => { :status => :user },
-      :tomchance => { :status => :user },
-      :lfrancke => { :status => :user },
-      :davidearl => { :status => :user },
-      :rweait => { :status => :user },
-      :ant => { :status => :user },
-      :milliams => { :status => :user },
+      :pafciu17 => { :status => :user },
       :pierzen => { :status => :user },
-      :gregory => { :status => :user },
-      :bsupnik => { :status => :user },
-      :derick => { :status => :user },
-      :joshd => { :status => :user },
-      :maba => { :status => :user },
       :pnorman => { :status => :user },
-      :csmale => { :status => :user },
-      :jgc => { :status => :user },
-      :cobra => { :status => :user },
       :ppawel => { :status => :user },
+      :random => { :status => :user },
+      :richard => { :status => :user },
+      :rtnf => { :status => :user },
+      :ris => { :status => :user },
+      :russ => { :status => :user },
+      :rweait => { :status => :user },
+      :shaunmcdonald => { :status => :user },
       :simon04 => { :status => :user },
-      :jfire => { :status => :user },
-      :malenki => { :status => :user },
-      :lonvia => { :status => :user },
-      :nicolas17 => { :status => :user },
-      :zverik => { :status => :user },
-      :dodobas => { :status => :user },
-      :mhohmann => { :status => :user },
-      :enelson => { :status => :user },
-      :gregrs => { :status => :user },
+      :simone => { :status => :user },
       :stereo => { :status => :user },
-      :dmlu => { :status => :user },
+      :steve8 => { :status => :user },
+      :timsc => { :status => :user },
+      :tomchance => { :status => :user },
+      :twain => { :status => :user },
+      :yellowbkpk => { :status => :user },
+      :zander => { :status => :user },
+      :zverik => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -84,6 +92,10 @@ default_attributes(
       :gpsmid => {
         :status => :role,
         :members => [:apmon, :maba]
+      },
+      :"za-imagery" => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]
       }
     }
   },
@@ -108,7 +120,9 @@ 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"
       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",
@@ -122,32 +136,26 @@ default_attributes(
         :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"
+      :signup => {
+        :repository => "https://github.com/milan-cvetkovic/openstreetmap-website.git",
+        :revision => "issue_4128_login_signup"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.1", "12"],
+    :versions => ["15"],
     :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",
-        :ssl => "false"
-      },
-      "12" => {
+      "15" => {
         :port => "5432",
-        :wal_level => "logical",
-        :max_replication_slots => "1"
+        :wal_level => "logical"
       }
     }
   },
@@ -159,6 +167,9 @@ default_attributes(
         "kernel.shmmax" => "17179869184"
       }
     }
+  },
+  :openssh => {
+    :password_authentication => true
   }
 )