X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3acb5c42fb0b3963eafa4e542d11b2a48b99cefc..4c86175022c9036999f9d8341e48cbd884448709:/cookbooks/web/recipes/cgimap.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 4a8ab12c1..e765cc865 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -26,6 +26,7 @@ package "gcc"
 package "make"
 package "autoconf"
 package "automake"
+package "libtool"
 package "libfcgi-dev"
 package "libxml2-dev"
 package "libmemcached-dev"
@@ -33,6 +34,7 @@ package "libboost-regex-dev"
 package "libboost-system-dev"
 package "libboost-program-options-dev"
 package "libboost-date-time-dev"
+package "libboost-filesystem-dev"
 package "libpqxx3-dev"
 package "zlib1g-dev"
 
@@ -92,7 +94,7 @@ cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line|
   line.gsub!(/^CGIMAP_LOGFILE=.*;/, "CGIMAP_LOGFILE=#{log_directory}/cgimap.log;")
   line.gsub!(/^CGIMAP_MEMCACHE=.*;/, "CGIMAP_MEMCACHE=rails1,rails2,rails3;")
 
-  line.gsub!(/\/home\/rails\/bin\/map/, "#{cgimap_directory}/map")
+  line.gsub!(%r{/home/rails/bin/map}, "#{cgimap_directory}/.libs/lt-map")
 
   if database_readonly
     line.gsub!(/--daemon/, "--daemon --readonly")
@@ -108,13 +110,13 @@ file "/etc/init.d/cgimap" do
   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]"