Update piwik to apache 2.4 style access controls

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 41b27f049d5e9d3715a33bf8dcf93b88adaa3ae1..4a8ab12c1ce0d0379e27f2de42844458677a47c4 100644 (file)
--- 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"
@@ -49,11 +50,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 +63,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 +72,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]
@@ -82,27 +83,29 @@ else
   database_readonly = node[:web][:status] == "database_readonly"
 end
 
+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=rails1,rails2,rails3;")
+
+  line.gsub!(/\/home\/rails\/bin\/map/, "#{cgimap_directory}/map")
+
+  if database_readonly
+    line.gsub!(/--daemon/, "--daemon --readonly")
+  end
+
+  line
+end
+
 file "/etc/init.d/cgimap" do
   owner "root"
   group "root"
   mode 0755
-  content_from_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=rails1,rails2,rails3;")
-
-    line.gsub!(/\/home\/rails\/bin\/map/, "#{cgimap_directory}/map")
-
-    if database_readonly
-      line.gsub!(/--daemon/, "--daemon --readonly")
-    end
-
-    line
-  end
+  content cgimap_init
 end
 
 if ["database_offline", "api_offline"].include?(node[:web][:status])
@@ -113,7 +116,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