Undoing some of the changes which reappeared after rebase.

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 8953820ef56856ce4c086b84d13f3286d67172f2..231915b149cf9d16dd2a31713a7cf308b1deadd5 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -22,61 +22,7 @@ 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"
-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"
-
-cgimap_directory = "#{node[:web][:base_directory]}/cgimap"
-pid_directory = node[:web][:pid_directory]
-log_directory = node[:web][:log_directory]
-
-execute "cgimap-build" do
-  action :nothing
-  command "make"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-end
-
-execute "cgimap-configure" do
-  action :nothing
-  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-build]", :immediate
-end
-
-execute "cgimap-autogen" do
-  action :nothing
-  command "./autogen.sh"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-configure]", :immediate
-end
-
-git cgimap_directory do
-  action :sync
-  repository "git://git.openstreetmap.org/cgimap.git"
-  revision "live"
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-autogen]", :immediate
-end
+package "openstreetmap-cgimap-bin"
 
 if node[:web][:readonly_database_host]
   database_host = node[:web][:readonly_database_host]
@@ -86,30 +32,21 @@ 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!(/^CGIMAP_RATELIMIT=.*;/, "CGIMAP_RATELIMIT=204800;")
-
-  line.gsub!(%r{/home/rails/bin/map}, "#{cgimap_directory}/map")
-
-  if database_readonly
-    line.gsub!(/--daemon/, "--daemon --readonly")
-  end
-
-  line
-end
+memcached_servers = node[:web][:memcached_servers] || []
 
-file "/etc/init.d/cgimap" do
+template "/etc/init.d/cgimap" do
   owner "root"
   group "root"
-  mode 0755
-  content cgimap_init
+  mode 0o755
+  source "cgimap.init.erb"
+  variables(
+    :db_password => db_passwords["rails"],
+    :pid_directory => node[:web][:pid_directory],
+    :log_directory => node[:web][:log_directory],
+    :database_host => database_host,
+    :database_readonly => database_readonly,
+    :memcached_servers => memcached_servers
+  )
 end
 
 if %w(database_offline api_offline).include?(node[:web][:status])
@@ -120,7 +57,7 @@ else
   service "cgimap" do
     action [:enable, :start]
     supports :restart => true, :reload => true
-    subscribes :restart, "execute[cgimap-build]"
+    subscribes :restart, "dpkg_package[openstreetmap-cgimap-bin]"
     subscribes :restart, "file[/etc/init.d/cgimap]"
   end
 end