Minor wordsmithing

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index cb7c62500c9a40da6ffdbb8ff715a0798dc503e2..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 },


@@ -67,6 +68,12 @@ default_attributes(
       :mhohmann => { :status => :user },
       :enelson => { :status => :user },
       :gregrs => { :status => :user },
       :mhohmann => { :status => :user },
       :enelson => { :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]


@@ -82,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]

       }
     }
   },
       }
     }
   },


@@ -90,62 +101,57 @@ 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

     }
   },
     }
   },

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :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",
-        :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"
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
+        :revision => "next",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_revision => "master",
+        :cgimap_options => {
+          :ratelimit_upload => true
+        }

       },
       :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 => {
       :locale => {

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

         :revision => "locale"
         :revision => "locale"

+      },
+      :microcosms => {
+        :repository => "https://github.com/openbrian/osm-microcosms.git",
+        :revision => "microcosms"

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

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

     :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"
+      "15" => {
+        :port => "5432",
+        :wal_level => "logical"

       }
     }
   },
       }
     }
   },


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

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

   }
 )
 
   }
 )