Revert "Disable OAuth 1.0a and basic authentication"

This reverts commit c60ff91e5dfabb87bf734fc6df64abd8d4c37ac2.

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 7188b5373a5ec4238bd891243dfb2fcef91c8fca..d3655068431971c0ee9b2b6802ed0fd9079b1689 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -64,7 +64,7 @@ systemd_service "cgimap" do
   user "rails"
   group "www-data"
   umask "0002"
   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
   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 debc4db50c1133d3f9f66f0a22567cc0a7606f9d..3f5078d3487354899d71d1448ea8bbda89f4b750 100644 (file)
--- 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,
     "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
   )
 
   if new_resource.memcache_servers