Merge remote-tracking branch 'github/pull/464'

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 65ec60f1c8207bad7d6db307d4e3ef099595197e..6c867f33db4d48bf4ef682577559195b2b0dfd32 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -43,7 +43,6 @@ default_attributes(
       :tomchance => { :status => :user },
       :lfrancke => { :status => :user },
       :davidearl => { :status => :user },
       :tomchance => { :status => :user },
       :lfrancke => { :status => :user },
       :davidearl => { :status => :user },

-      :emacsen => { :status => :user },

       :rweait => { :status => :user },
       :ant => { :status => :user },
       :milliams => { :status => :user },
       :rweait => { :status => :user },
       :ant => { :status => :user },
       :milliams => { :status => :user },


@@ -66,6 +65,10 @@ default_attributes(
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :mhohmann => { :status => :user },
       :zverik => { :status => :user },
       :dodobas => { :status => :user },
       :mhohmann => { :status => :user },

+      :enelson => { :status => :user },
+      :gregrs => { :status => :user },
+      :stereo => { :status => :user },
+      :dmlu => { :status => :user },

       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]


@@ -89,58 +92,65 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_request_workers => 800,

       :threads_per_child => 50,
       :threads_per_child => 50,

-      :max_requests_per_child => 10000
+      :max_connections_per_child => 10000

     }
   },
   :dev => {
     :rails => {
       :master => {
     }
   },
   :dev => {
     :rails => {
       :master => {

-        :repository => "git://git.openstreetmap.org/rails.git",
+        :repository => "https://git.openstreetmap.org/public/rails.git",

         :revision => "master",
         :revision => "master",

+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "master",

         :aliases => ["api06.dev.openstreetmap.org"]
       },
       :tomh => {
         :aliases => ["api06.dev.openstreetmap.org"]
       },
       :tomh => {

-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",

         :revision => "next"
       },
         :revision => "next"
       },

-      :owl => {
-        :repository => "git://github.com/ppawel/openstreetmap-website.git",
-        :revision => "owl-activity-tab"
-      },
-      :groups => {
-        :repository => "git://github.com/osmlab/openstreetmap-website.git",
-        :revision => "groups-sketch"
-      },

       :comments => {
       :comments => {

-        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :repository => "https://github.com/ukasiu/openstreetmap-website.git",

         :revision => "comments_list"
       },
         :revision => "comments_list"
       },

-      :moderation => {
-        :repository => "git://github.com/sbagroy986/openstreetmap-website.git",
-        :revision => "moderation_queue"
+      :locale => {
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "locale"
+      },
+      :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"

       }
     }
   },
       }
     }
   },

-  :passenger => {
-    :ruby_version => "2.1"
-  },

   :postgresql => {
   :postgresql => {

-    :versions => ["9.1", "9.3"],
+    :versions => ["13"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

+        :max_connections => "500",

         :shared_buffers => "1GB",
         :work_mem => "32MB",
         :maintenance_work_mem => "64MB",
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
         :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"
+      "13" => {
+        :port => "5432",
+        :wal_level => "logical",
+        :max_replication_slots => "1"

       }
     }
   },
       }
     }
   },