X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/007eb98f5f779bef67a514f0f4a723e90abc7c25..794cc957324de66edab45373053be3e601090f1f:/cookbooks/web/recipes/cgimap.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 7188b5373..72e41b3e2 100644 --- a/cookbooks/web/recipes/cgimap.rb +++ b/cookbooks/web/recipes/cgimap.rb @@ -24,6 +24,10 @@ include_recipe "web::base" db_passwords = data_bag_item("db", "passwords") package "openstreetmap-cgimap-bin" do + action :purge +end + +package "openstreetmap-cgimap" do action :install end @@ -37,7 +41,6 @@ cgimap_options = { "CGIMAP_DBNAME" => "openstreetmap", "CGIMAP_USERNAME" => "cgimap", "CGIMAP_PASSWORD" => db_passwords["cgimap"], - "CGIMAP_OAUTH_HOST" => node[:web][:database_host], "CGIMAP_UPDATE_HOST" => node[:web][:database_host], "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid", "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log", @@ -50,7 +53,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_RATELIMIT_UPLOAD" => "true" + "CGIMAP_RATELIMIT_UPLOAD" => "true", + "CGIMAP_BBOX_SIZE_LIMIT_UPLOAD" => "true" } if %w[database_readonly api_readonly].include?(node[:web][:status]) @@ -64,7 +68,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