Remove duplicate entry for Dublin OOB

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index 672c5e022a61d65b951e3a693b7fdb46e546b217..3ba2b803f356b3ea7d565d39bf6d38083d9a98e9 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -69,6 +69,7 @@ default_attributes(
       :gregrs => { :status => :user },
       :stereo => { :status => :user },
       :dmlu => { :status => :user },
+      :antonkh => { :status => :user },
       :ooc => {
         :status => :role,
         :members => [:tomh, :blackadder, :timsc, :ollie]
@@ -121,30 +122,21 @@ default_attributes(
       :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"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.1", "12"],
+    :versions => ["14"],
     :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" => {
+      "14" => {
         :port => "5432",
         :wal_level => "logical",
         :max_replication_slots => "1"
@@ -159,6 +151,9 @@ default_attributes(
         "kernel.shmmax" => "17179869184"
       }
     }
+  },
+  :openssh => {
+    :password_authentication => true
   }
 )