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

[chef.git] / roles / dev.rb

diff --git a/roles/dev.rb b/roles/dev.rb
index a68f94c8c072560f2a5e8fa1db7201ab55772b63..1ed5d6c8478258ac63b3b7cd48b993e3ac43440e 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -127,17 +127,11 @@ default_attributes(
         :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",
-        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
-        :cgimap_revision => "feature/oauth2"
       }
     }
   },
   :postgresql => {
-    :versions => ["13"],
+    :versions => ["14"],
     :settings => {
       :defaults => {
         :max_connections => "500",
@@ -147,7 +141,7 @@ default_attributes(
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
-      "13" => {
+      "14" => {
         :port => "5432",
         :wal_level => "logical",
         :max_replication_slots => "1"