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 61d1162b1cab711bade231cd874a0b0198eb2bd1..72e41b3e2515295ae1603191914b8750ac8d47ba 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: cgimap
 #
 # Recipe:: cgimap
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,43 +17,60 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"

 include_recipe "tools"
 include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
 package "openstreetmap-cgimap-bin" do
 include_recipe "tools"
 include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
 package "openstreetmap-cgimap-bin" do

-  action :upgrade
+  action :purge

 end
 
 end
 

-if node[:web][:readonly_database_host]
-  database_host = node[:web][:readonly_database_host]
-  database_readonly = node[:web][:readonly_database_host] != node[:web][:database_host]
-else
-  database_host = node[:web][:database_host]
-  database_readonly = node[:web][:status] == "database_readonly"
+package "openstreetmap-cgimap" do
+  action :install

 end
 
 end
 

+database_host = node[:web][:readonly_database_host] || node[:web][:database_host]
+

 memcached_servers = node[:web][:memcached_servers] || []
 
 memcached_servers = node[:web][:memcached_servers] || []
 

-switches = database_readonly ? " --readonly" : ""
+cgimap_options = {
+  "CGIMAP_SOCKET" => "/run/cgimap/socket",
+  "CGIMAP_HOST" => database_host,
+  "CGIMAP_DBNAME" => "openstreetmap",
+  "CGIMAP_USERNAME" => "cgimap",
+  "CGIMAP_PASSWORD" => db_passwords["cgimap"],
+  "CGIMAP_UPDATE_HOST" => node[:web][:database_host],
+  "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
+  "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",
+  "CGIMAP_MEMCACHE" => memcached_servers.join(","),
+  "CGIMAP_RATELIMIT" => "204800",
+  "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",
+  "CGIMAP_BBOX_SIZE_LIMIT_UPLOAD" => "true"
+}
+
+if %w[database_readonly api_readonly].include?(node[:web][:status])
+  cgimap_options["CGIMAP_DISABLE_API_WRITE"] = "true"
+end

 
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"
 
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"

-  environment_file "CGIMAP_HOST" => database_host,
-                   "CGIMAP_DBNAME" => "openstreetmap",
-                   "CGIMAP_USERNAME" => "cgimap",
-                   "CGIMAP_PASSWORD" => db_passwords["cgimap"],
-                   "CGIMAP_OAUTH_HOST" => node[:web][:database_host],
-                   "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
-                   "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",
-                   "CGIMAP_MEMCACHE" => memcached_servers.join(","),
-                   "CGIMAP_RATELIMIT" => "204800",
-                   "CGIMAP_MAXDEBT" => "250"
+  environment_file cgimap_options

   user "rails"
   user "rails"

-  exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30#{switches}"
+  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"