X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0885511637f2cab59071459563704c79be69249c..1d23c59f10b2636d9c20b3da441aa22373f88af4:/cookbooks/web/recipes/cgimap.rb

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 8553d6ff5..2adb9d099 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -22,10 +22,12 @@ 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"
@@ -33,19 +35,14 @@ package "libboost-regex-dev"
 package "libboost-system-dev"
 package "libboost-program-options-dev"
 package "libboost-date-time-dev"
-package "libpqxx3-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]
 
-if node[:lsb][:release].to_f >= 14.04
-  libdir = "/usr/lib/x86_64-linux-gnu"
-else
-  libdir = "/usr/lib"
-end
-
 execute "cgimap-build" do
   action :nothing
   command "make"
@@ -56,7 +53,7 @@ end
 
 execute "cgimap-configure" do
   action :nothing
-  command "./configure --with-fcgi=/usr --with-boost-libdir=#{libdir}"
+  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
   cwd cgimap_directory
   user "rails"
   group "rails"
@@ -89,6 +86,8 @@ 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;")
@@ -96,9 +95,12 @@ cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line|
   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=rails1,rails2,rails3;")
+  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!(/\/home\/rails\/bin\/map/, "#{cgimap_directory}/map")
+  line.gsub!(%r{/home/rails/bin/openstreetmap-cgimap}, "#{cgimap_directory}/openstreetmap-cgimap")
 
   if database_readonly
     line.gsub!(/--daemon/, "--daemon --readonly")
@@ -110,17 +112,17 @@ end
 file "/etc/init.d/cgimap" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   content cgimap_init
 end
 
-if ["database_offline", "api_offline"].include?(node[:web][:status])
+if %w(database_offline api_offline).include?(node[:web][:status])
   service "cgimap" do
     action :stop
   end
 else
   service "cgimap" do
-    action [ :enable, :start ]
+    action [:enable, :start]
     supports :restart => true, :reload => true
     subscribes :restart, "execute[cgimap-build]"
     subscribes :restart, "file[/etc/init.d/cgimap]"