Use a systemd unit for cgimap

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index a0dc45fa0be66eb3d453ca2a4b81a503f987d91f..93ea61da44f38f717366d64a2101dd1dd085fd45 100644 (file)
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -14,3 +14,4 @@ depends           "tools"
 depends           "nfs"
 depends           "accounts"
 depends           "apt"
+depends           "systemd"

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 231915b149cf9d16dd2a31713a7cf308b1deadd5..ef8f9bcef225f785296868a4900ed2444098aa00 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -34,19 +34,28 @@ end
 
 memcached_servers = node[:web][:memcached_servers] || []
 
-template "/etc/init.d/cgimap" do
-  owner "root"
-  group "root"
-  mode 0o755
-  source "cgimap.init.erb"
-  variables(
-    :db_password => db_passwords["rails"],
-    :pid_directory => node[:web][:pid_directory],
-    :log_directory => node[:web][:log_directory],
-    :database_host => database_host,
-    :database_readonly => database_readonly,
-    :memcached_servers => memcached_servers
-  )
+switches = database_readonly ? " --readonly" : ""
+
+systemd_service "cgimap" do
+  description "OpenStreetMap API Server"
+  type "forking"
+  environment "CGIMAP_HOST" => database_host,
+              "CGIMAP_DBNAME" => "openstreetmap",
+              "CGIMAP_USERNAME" => "rails",
+              "CGIMAP_PASSWORD" => db_passwords["rails"],
+              "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}"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  restart "on-failure"
+  pid_file "#{node[:web][:pid_directory]}/cgimap.pid"
 end
 
 if %w(database_offline api_offline).include?(node[:web][:status])
@@ -58,6 +67,6 @@ else
     action [:enable, :start]
     supports :restart => true, :reload => true
     subscribes :restart, "dpkg_package[openstreetmap-cgimap-bin]"
-    subscribes :restart, "file[/etc/init.d/cgimap]"
+    subscribes :restart, "systemd_service[cgimap]"
   end
 end

diff --git a/cookbooks/web/templates/default/cgimap.init.erb b/cookbooks/web/templates/default/cgimap.init.erb
deleted file mode 100644 (file)
index 9048f1f..0000000
--- a/cookbooks/web/templates/default/cgimap.init.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-CGIMAP_HOST=<%= @database_host %>; export CGIMAP_HOST
-CGIMAP_DBNAME=openstreetmap; export CGIMAP_DBNAME
-CGIMAP_USERNAME=rails; export CGIMAP_USERNAME
-CGIMAP_PASSWORD=<%= @db_password %>; export CGIMAP_PASSWORD
-
-CGIMAP_PIDFILE=<%= @pid_directory + "/cgimap.pid" %>; export CGIMAP_PIDFILE
-CGIMAP_LOGFILE=<%= @log_directory + "/cgimap.log" %>; export CGIMAP_LOGFILE
-
-CGIMAP_MEMCACHE=<%= @memcached_servers.join(",") %>; export CGIMAP_MEMCACHE
-CGIMAP_RATELIMIT=204800; export CGIMAP_RATELIMIT
-CGIMAP_MAXDEBT=250; export CGIMAP_MAXDEBT
-
-start() {
-  start-stop-daemon --start --chuid rails --exec /usr/bin/openstreetmap-cgimap --pidfile $CGIMAP_PIDFILE -- --daemon <% if @database_readonly %>--readonly<% end %> --port=8000 --instances=30
-}
-
-stop() {
-  start-stop-daemon --stop --retry 300 --pidfile $CGIMAP_PIDFILE
-}
-
-reload() {
-  start-stop-daemon --stop --signal HUP --pidfile $CGIMAP_PIDFILE
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  reload)
-    reload
-    ;;
-  restart)
-    stop || exit $?
-    start
-    ;;
-esac