Enable upload rate limiting for cgimap

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 4ac28760f4c7879d59982595b91bd324a481d438..3a838a35300839608587819c2d5bdb7ea9b0604d 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -5,7 +5,7 @@ default_attributes(
   :accounts => {
     :users => {
       :edgemaster => { :status => :administrator },
   :accounts => {
     :users => {
       :edgemaster => { :status => :administrator },

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

       :twain => { :status => :user },
       :bretth => { :status => :user },
       :richard => { :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 },
       :cobra => { :status => :user },
       :ppawel => { :status => :user },
       :simon04 => { :status => :user },

+      :jeslop => { :status => :user },

       :jfire => { :status => :user },
       :malenki => { :status => :user },
       :lonvia => { :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 },
       :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]
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]


@@ -84,6 +89,10 @@ default_attributes(
       :gpsmid => {
         :status => :role,
         :members => [:apmon, :maba]
       :gpsmid => {
         :status => :role,
         :members => [:apmon, :maba]

+      },
+      :"za-imagery" => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]

       }
     }
   },
       }
     }
   },


@@ -108,7 +117,12 @@ default_attributes(
       },
       :tomh => {
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",
       },
       :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",
       },
       :comments => {
         :repository => "https://github.com/ukasiu/openstreetmap-website.git",


@@ -121,25 +135,11 @@ default_attributes(
       :microcosms => {
         :repository => "https://github.com/openbrian/osm-microcosms.git",
         :revision => "microcosms"
       :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"
-      },
-      :oauth2 => {
-        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "doorkeeper"
-      },
-      :rails61 => {
-        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
-        :revision => "rails61"

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

-    :versions => ["13"],
+    :versions => ["15"],

     :settings => {
       :defaults => {
         :max_connections => "500",
     :settings => {
       :defaults => {
         :max_connections => "500",


@@ -149,10 +149,9 @@ default_attributes(
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },

-      "13" => {
+      "15" => {

         :port => "5432",
         :port => "5432",

-        :wal_level => "logical",
-        :max_replication_slots => "1"
+        :wal_level => "logical"

       }
     }
   },
       }
     }
   },


@@ -164,6 +163,9 @@ default_attributes(
         "kernel.shmmax" => "17179869184"
       }
     }
         "kernel.shmmax" => "17179869184"
       }
     }

+  },
+  :openssh => {
+    :password_authentication => true

   }
 )
 
   }
 )