Update piwik to 3.1.0

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index a761f6fff8e0799498bb744a6ac23b5123eccc22..8303955c2f3e1b329be9bd3070910da8ad4f1b56 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -22,17 +22,48 @@ include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
-package "openstreetmap-cgimap-bin"
-
-template "/etc/init.d/cgimap" do
-  owner "root"
-  group "root"
-  mode 0o755
-  source "cgimap.init.erb"
-  variables :db_password => db_passwords['rails']
+package "openstreetmap-cgimap-bin" do
+  action :upgrade
 end
 
-if %w(database_offline api_offline).include?(node[:web][:status])
+if node[:web][:readonly_database_host]
+  database_host = node[:web][:readonly_database_host]
+  database_readonly = true
+else
+  database_host = node[:web][:database_host]
+  database_readonly = node[:web][:status] == "database_readonly"
+end
+
+memcached_servers = node[:web][:memcached_servers] || []
+
+switches = database_readonly ? " --readonly" : ""
+
+systemd_service "cgimap" do
+  description "OpenStreetMap API Server"
+  type "forking"
+  environment_file "CGIMAP_HOST" => database_host,
+                   "CGIMAP_DBNAME" => "openstreetmap",
+                   "CGIMAP_USERNAME" => "rails",
+                   "CGIMAP_PASSWORD" => db_passwords["rails"],
+                   "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"
+  user "rails"
+  exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30#{switches}"
+  exec_reload "/bin/kill -HUP $MAINPID"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  no_new_privileges true
+  restart "on-failure"
+  pid_file "#{node[:web][:pid_directory]}/cgimap.pid"
+end
+
+if %w[database_offline api_offline].include?(node[:web][:status])
   service "cgimap" do
     action :stop
   end
@@ -40,7 +71,7 @@ else
   service "cgimap" do
     action [:enable, :start]
     supports :restart => true, :reload => true
-    subscribes :restart, "dpkg_package[openstreetmap-cgimap-bin]"
-    subscribes :restart, "file[/etc/init.d/cgimap]"
+    subscribes :restart, "package[openstreetmap-cgimap-bin]"
+    subscribes :restart, "systemd_service[cgimap]"
   end
 end