X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..d8bf5199b0571deedb766520adb5cc20a5d18e57:/cookbooks/web/recipes/cgimap.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 2adb9d099..7fb417b38 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -22,60 +22,8 @@ include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
-package "g++"
-package "gcc"
-package "make"
-package "autoconf"
-package "automake"
-package "libtool"
-package "libfcgi-dev"
-package "libxml2-dev"
-package "libmemcached-dev"
-package "libboost-regex-dev"
-package "libboost-system-dev"
-package "libboost-program-options-dev"
-package "libboost-date-time-dev"
-package "libboost-filesystem-dev"
-package "libpqxx-dev"
-package "zlib1g-dev"
-
-cgimap_directory = "#{node[:web][:base_directory]}/cgimap"
-pid_directory = node[:web][:pid_directory]
-log_directory = node[:web][:log_directory]
-
-execute "cgimap-build" do
-  action :nothing
-  command "make"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-end
-
-execute "cgimap-configure" do
-  action :nothing
-  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-build]", :immediate
-end
-
-execute "cgimap-autogen" do
-  action :nothing
-  command "./autogen.sh"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-configure]", :immediate
-end
-
-git cgimap_directory do
-  action :sync
-  repository "git://git.openstreetmap.org/cgimap.git"
-  revision "live"
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-autogen]", :immediate
+package "openstreetmap-cgimap-bin" do
+  action :upgrade
 end
 
 if node[:web][:readonly_database_host]
@@ -86,34 +34,32 @@ else
   database_readonly = node[:web][:status] == "database_readonly"
 end
 
-memcached_servers = node[:web][:memcached_servers]
-
-cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line|
-  line.gsub!(/^CGIMAP_HOST=.*;/, "CGIMAP_HOST=#{database_host};")
-  line.gsub!(/^CGIMAP_DBNAME=.*;/, "CGIMAP_DBNAME=openstreetmap;")
-  line.gsub!(/^CGIMAP_USERNAME=.*;/, "CGIMAP_USERNAME=rails;")
-  line.gsub!(/^CGIMAP_PASSWORD=.*;/, "CGIMAP_PASSWORD=#{db_passwords['rails']};")
-  line.gsub!(/^CGIMAP_PIDFILE=.*;/, "CGIMAP_PIDFILE=#{pid_directory}/cgimap.pid;")
-  line.gsub!(/^CGIMAP_LOGFILE=.*;/, "CGIMAP_LOGFILE=#{log_directory}/cgimap.log;")
-  line.gsub!(/^CGIMAP_MEMCACHE=.*;/, "CGIMAP_MEMCACHE=#{memcached_servers.join(',')};")
-  line.gsub!(/^CGIMAP_RATELIMIT=.*;/, "CGIMAP_RATELIMIT=204800;")
-
-  line.gsub!(%r{--pidfile \$CGIMAP_PIDFILE --exec /home/rails/bin/openstreetmap-cgimap}, "--pidfile $CGIMAP_PIDFILE")
-
-  line.gsub!(%r{/home/rails/bin/openstreetmap-cgimap}, "#{cgimap_directory}/openstreetmap-cgimap")
-
-  if database_readonly
-    line.gsub!(/--daemon/, "--daemon --readonly")
-  end
-
-  line
-end
-
-file "/etc/init.d/cgimap" do
-  owner "root"
-  group "root"
-  mode 0o755
-  content cgimap_init
+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
+  restart "on-failure"
+  pid_file "#{node[:web][:pid_directory]}/cgimap.pid"
 end
 
 if %w(database_offline api_offline).include?(node[:web][:status])
@@ -124,7 +70,7 @@ else
   service "cgimap" do
     action [:enable, :start]
     supports :restart => true, :reload => true
-    subscribes :restart, "execute[cgimap-build]"
-    subscribes :restart, "file[/etc/init.d/cgimap]"
+    subscribes :restart, "package[openstreetmap-cgimap-bin]"
+    subscribes :restart, "systemd_service[cgimap]"
   end
 end