X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/78b24940a847bd0adf139756e6e591530b44256e..9584cda7a747710c42f2d4b2bd876c4014f1ad6f:/roles/dev.rb?ds=inline

diff --git a/roles/dev.rb b/roles/dev.rb
index 1c9250255..f85849e88 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -4,83 +4,98 @@ 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 },
-      :emacsen => { :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 },
+      :simone => { :status => :user },
+      :stereo => { :status => :user },
+      :steve8 => { :status => :user },
+      :timsc => { :status => :user },
+      :tomchance => { :status => :user },
+      :twain => { :status => :user },
+      :yellowbkpk => { :status => :user },
+      :zander => { :status => :user },
       :zverik => { :status => :user },
-      :dodobas => { :status => :user },
-      :mhohmann => { :status => :user },
-      :ooc => { 
-        :status => :role, 
-        :members => [ :tomh, :blackadder, :timsc, :ollie ] 
+      :ooc => {
+        :status => :role,
+        :members => [:tomh, :blackadder, :timsc, :ollie]
+      },
+      :apis => {
+        :status => :role,
+        :members => [:tomh]
       },
-      :apis => { 
-        :status => :role, 
-        :members => [ :tomh ] 
+      :os => {
+        :status => :role,
+        :members => [:tomh, :grant, :ollie]
       },
-      :os => { 
-        :status => :role, 
-        :members => [ :tomh, :grant, :ollie ] 
+      :gpsmid => {
+        :status => :role,
+        :members => [:apmon, :maba]
       },
-      :gpsmid => { 
-        :status => :role, 
-        :members => [ :apmon, :maba ] 
+      :"za-imagery" => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]
       }
     }
   },
@@ -89,78 +104,72 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
-      :max_clients => 800,
+      :max_request_workers => 800,
       :threads_per_child => 50,
-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000
     }
   },
   :dev => {
     :rails => {
       :master => {
-        :repository => "git://git.openstreetmap.org/rails.git",
+        :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
-        :aliases => [ "api06.dev.openstreetmap.org" ]
-      },
-      :routing => {
-        :repository => "git://github.com/apmon/openstreetmap-website.git",
-        :revision => "routing2"
+        :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",
-        :revision => "next"
-      },
-      :owl => {
-        :repository => "git://github.com/ppawel/openstreetmap-website.git",
-        :revision => "owl-history-tab"
-      },
-      :groups => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "groups-sketch"
-      },
-      :jsrouting => {
-        :repository => "git://github.com/systemed/openstreetmap-website.git",
-        :revision => "routing"
-      },
-      :jsrouting2 => {
-        :repository => "git://github.com/jfirebaugh/openstreetmap-website.git",
-        :revision => "routing"
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "next",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "master"
       },
       :comments => {
-        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :repository => "https://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       },
-      :rails42 => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails42"
+      :locale => {
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "locale"
+      },
+      :microcosms => {
+        :repository => "https://github.com/openbrian/osm-microcosms.git",
+        :revision => "microcosms"
+      },
+      :signup => {
+        :repository => "https://github.com/milan-cvetkovic/openstreetmap-website.git",
+        :revision => "issue_4128_login_signup"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1", "9.3" ],
+    :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"
-      },
-      "9.3" => {
-        :port => "5432"
+      "15" => {
+        :port => "5432",
+        :wal_level => "logical"
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmall" => "4194304",
         "kernel.shmmax" => "17179869184"
       }
     }
+  },
+  :openssh => {
+    :password_authentication => true
   }
 )