Drop no longer supported switches from cgimap

[chef.git] / cookbooks / web / recipes / cgimap.rb

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 7188b5373a5ec4238bd891243dfb2fcef91c8fca..380f2a8eb734f9f9a211e8042705029e5458714c 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -50,7 +50,8 @@ cgimap_options = {
   "CGIMAP_MAP_NODES" => node[:web][:max_number_of_nodes],
   "CGIMAP_MAX_WAY_NODES" => node[:web][:max_number_of_way_nodes],
   "CGIMAP_MAX_RELATION_MEMBERS" => node[:web][:max_number_of_relation_members],
   "CGIMAP_MAP_NODES" => node[:web][:max_number_of_nodes],
   "CGIMAP_MAX_WAY_NODES" => node[:web][:max_number_of_way_nodes],
   "CGIMAP_MAX_RELATION_MEMBERS" => node[:web][:max_number_of_relation_members],

-  "CGIMAP_RATELIMIT_UPLOAD" => "true"
+  "CGIMAP_RATELIMIT_UPLOAD" => "true",
+  "CGIMAP_BBOX_SIZE_LIMIT_UPLOAD" => "true"

 }
 
 if %w[database_readonly api_readonly].include?(node[:web][:status])
 }
 
 if %w[database_readonly api_readonly].include?(node[:web][:status])


@@ -64,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 --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