Disable OAuth 1.0a and basic authentication

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 380f2a8eb734f9f9a211e8042705029e5458714c..4f1b46e00290a9024baef750bf2d553ac9ea439c 100644 (file)
--- 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"
   user "rails"
   group "www-data"
   umask "0002"

-  exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30"
+  exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30 --basic_auth_support false --oauth_10_support falsE"

   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 3f5078d3487354899d71d1448ea8bbda89f4b750..debc4db50c1133d3f9f66f0a22567cc0a7606f9d 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -364,7 +364,9 @@ 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_10_registration" => false,
+    "oauth_10a_support" => false,
+    "basic_auth_support" => false

   )
 
   if new_resource.memcache_servers
   )
 
   if new_resource.memcache_servers