Revert "Switch the web site to use poldi for nominatim"

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index c1f8e894e90390c2f770b7e4c84c53ca2a9f0c2f..e765cc865bccb19736b469e9c2bf49973f8bd6c2 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -26,12 +26,15 @@ 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 "libpqxx3-dev"
 package "zlib1g-dev"
 
@@ -49,11 +52,11 @@ end
 
 execute "cgimap-configure" do
   action :nothing
-  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib"
+  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
   cwd cgimap_directory
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "cgimap-build"), :immediate
+  notifies :run, "execute[cgimap-build]", :immediate
 end
 
 execute "cgimap-autogen" do
@@ -62,7 +65,7 @@ execute "cgimap-autogen" do
   cwd cgimap_directory
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "cgimap-configure"), :immediate
+  notifies :run, "execute[cgimap-configure]", :immediate
 end
 
 git cgimap_directory do
@@ -71,7 +74,7 @@ git cgimap_directory do
   revision "live"
   user "rails"
   group "rails"
-  notifies :run, resources(:execute => "cgimap-autogen"), :immediate
+  notifies :run, "execute[cgimap-autogen]", :immediate
 end
 
 if node[:web][:readonly_database_host]
@@ -91,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")
@@ -107,15 +110,15 @@ 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, resources(:execute => "cgimap-build")
-    subscribes :restart, resources(:file => "/etc/init.d/cgimap")
+    subscribes :restart, "execute[cgimap-build]"
+    subscribes :restart, "file[/etc/init.d/cgimap]"
   end
 end