X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fc3a64ac905c9366e91bb0f62a3b6cea7928adb2..6d19b737f8388401f8f0be1f654a0150254e5ce5:/cookbooks/web/recipes/cgimap.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 3936c8500..d36550684 100644 --- a/cookbooks/web/recipes/cgimap.rb +++ b/cookbooks/web/recipes/cgimap.rb @@ -24,7 +24,7 @@ include_recipe "web::base" db_passwords = data_bag_item("db", "passwords") package "openstreetmap-cgimap-bin" do - action :upgrade + action :install end database_host = node[:web][:readonly_database_host] || node[:web][:database_host] @@ -32,6 +32,7 @@ database_host = node[:web][:readonly_database_host] || node[:web][:database_host memcached_servers = node[:web][:memcached_servers] || [] cgimap_options = { + "CGIMAP_SOCKET" => "/run/cgimap/socket", "CGIMAP_HOST" => database_host, "CGIMAP_DBNAME" => "openstreetmap", "CGIMAP_USERNAME" => "cgimap", @@ -42,7 +43,14 @@ cgimap_options = { "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log", "CGIMAP_MEMCACHE" => memcached_servers.join(","), "CGIMAP_RATELIMIT" => "204800", - "CGIMAP_MAXDEBT" => "250" + "CGIMAP_MAXDEBT" => "250", + "CGIMAP_MODERATOR_RATELIMIT" => "1048576", + "CGIMAP_MODERATOR_MAXDEBT" => "1280", + "CGIMAP_MAP_AREA" => node[:web][:max_request_area], + "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" } if %w[database_readonly api_readonly].include?(node[:web][:status]) @@ -54,8 +62,11 @@ systemd_service "cgimap" do type "forking" environment_file cgimap_options user "rails" - exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30" + group "www-data" + umask "0002" + exec_start "/usr/bin/openstreetmap-cgimap --daemon --instances 30" exec_reload "/bin/kill -HUP $MAINPID" + runtime_directory "cgimap" private_tmp true private_devices true protect_system "full"