From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Jun 2024 06:02:10 +0000 (+0100)
Subject: Revert "Disable OAuth 1.0a and basic authentication"
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/98c27d937bed06af5407b8ee313dbcf5076d8a68

Revert "Disable OAuth 1.0a and basic authentication"

This reverts commit e2b6fbcfbc1b61a64d6157264e0eba5a37e4ceb1.
---

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 4f1b46e00..380f2a8eb 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -65,7 +65,7 @@ systemd_service "cgimap" do
   user "rails"
   group "www-data"
   umask "0002"
-  exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30 --basic_auth_support false --oauth_10_support falsE"
+  exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30"
   exec_reload "/bin/kill -HUP $MAINPID"
   runtime_directory "cgimap"
   private_tmp true
diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index debc4db50..3f5078d34 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -364,9 +364,7 @@ action :create do
     "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],
     "max_number_of_relation_members" => node[:web][:max_number_of_relation_members],
     "oauth_10_support" => false,
-    "oauth_10_registration" => false,
-    "oauth_10a_support" => false,
-    "basic_auth_support" => false
+    "oauth_10_registration" => false
   )
 
   if new_resource.memcache_servers