X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/59df18a47e1431952fcf82ca8ab318c2566370dc..1763f0e1483f6d301d031fc8341d17302e11548f:/cookbooks/web/recipes/cgimap.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index c1f8e894e..8553d6ff5 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -30,6 +30,7 @@ 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 "libpqxx3-dev"
@@ -39,6 +40,12 @@ 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"
@@ -49,11 +56,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=#{libdir}"
   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 +69,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 +78,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]
@@ -115,7 +122,7 @@ else
   service "cgimap" do
     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