Drop CGIMAP_OAUTH_HOST setting

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 8a8a7de1cf2a58b35f00bb3bc2f331e6bb533df6..72e41b3e2515295ae1603191914b8750ac8d47ba 100644 (file)
--- 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
 db_passwords = data_bag_item("db", "passwords")
 
 package "openstreetmap-cgimap-bin" do

+  action :purge
+end
+
+package "openstreetmap-cgimap" do

   action :install
 end
 
   action :install
 end
 


@@ -32,11 +36,11 @@ database_host = node[:web][:readonly_database_host] || node[:web][:database_host
 memcached_servers = node[:web][:memcached_servers] || []
 
 cgimap_options = {
 memcached_servers = node[:web][:memcached_servers] || []
 
 cgimap_options = {

+  "CGIMAP_SOCKET" => "/run/cgimap/socket",

   "CGIMAP_HOST" => database_host,
   "CGIMAP_DBNAME" => "openstreetmap",
   "CGIMAP_USERNAME" => "cgimap",
   "CGIMAP_PASSWORD" => db_passwords["cgimap"],
   "CGIMAP_HOST" => database_host,
   "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",
   "CGIMAP_UPDATE_HOST" => node[:web][:database_host],
   "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
   "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",


@@ -49,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_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])


@@ -61,8 +66,11 @@ systemd_service "cgimap" do
   type "forking"
   environment_file cgimap_options
   user "rails"
   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"
   exec_reload "/bin/kill -HUP $MAINPID"

+  runtime_directory "cgimap"

   private_tmp true
   private_devices true
   protect_system "full"
   private_tmp true
   private_devices true
   protect_system "full"