Merge remote-tracking branch 'github/pull/69'

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index 5058ffb2a7514ab266a404ce56e0fc4b0ae5eb8a..a0dc45fa0be66eb3d453ca2a4b81a503f987d91f 100644 (file)
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email  "admins@openstreetmap.org"
 license           "Apache 2.0"
 description       "Installs and configures www.openstreetmap.org servers"
 long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
-version           "1.0.0"
+version           "1.0.1"
 depends           "apache"
 depends           "passenger"
 depends           "git"
@@ -12,3 +12,5 @@ depends           "memcached"
 depends           "nodejs"
 depends           "tools"
 depends           "nfs"
+depends           "accounts"
+depends           "apt"

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 2adb9d099e0cbdb19301dc6656bd0009b0a718dc..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 "libpqxx-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,34 +32,21 @@ else
   database_readonly = node[:web][:status] == "database_readonly"
 end
 
-memcached_servers = node[:web][:memcached_servers]
-
-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=#{memcached_servers.join(',')};")
-  line.gsub!(/^CGIMAP_RATELIMIT=.*;/, "CGIMAP_RATELIMIT=204800;")
-
-  line.gsub!(%r{--pidfile \$CGIMAP_PIDFILE --exec /home/rails/bin/openstreetmap-cgimap}, "--pidfile $CGIMAP_PIDFILE")
-
-  line.gsub!(%r{/home/rails/bin/openstreetmap-cgimap}, "#{cgimap_directory}/openstreetmap-cgimap")
-
-  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 0o755
-  content cgimap_init
+  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])
@@ -124,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

diff --git a/cookbooks/web/templates/default/cgimap.init.erb b/cookbooks/web/templates/default/cgimap.init.erb
new file mode 100644 (file)
index 0000000..9048f1f
--- /dev/null
+++ b/cookbooks/web/templates/default/cgimap.init.erb
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+CGIMAP_HOST=<%= @database_host %>; export CGIMAP_HOST
+CGIMAP_DBNAME=openstreetmap; export CGIMAP_DBNAME
+CGIMAP_USERNAME=rails; export CGIMAP_USERNAME
+CGIMAP_PASSWORD=<%= @db_password %>; export CGIMAP_PASSWORD
+
+CGIMAP_PIDFILE=<%= @pid_directory + "/cgimap.pid" %>; export CGIMAP_PIDFILE
+CGIMAP_LOGFILE=<%= @log_directory + "/cgimap.log" %>; export CGIMAP_LOGFILE
+
+CGIMAP_MEMCACHE=<%= @memcached_servers.join(",") %>; export CGIMAP_MEMCACHE
+CGIMAP_RATELIMIT=204800; export CGIMAP_RATELIMIT
+CGIMAP_MAXDEBT=250; export CGIMAP_MAXDEBT
+
+start() {
+  start-stop-daemon --start --chuid rails --exec /usr/bin/openstreetmap-cgimap --pidfile $CGIMAP_PIDFILE -- --daemon <% if @database_readonly %>--readonly<% end %> --port=8000 --instances=30
+}
+
+stop() {
+  start-stop-daemon --stop --retry 300 --pidfile $CGIMAP_PIDFILE
+}
+
+reload() {
+  start-stop-daemon --stop --signal HUP --pidfile $CGIMAP_PIDFILE
+}
+
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  reload)
+    reload
+    ;;
+  restart)
+    stop || exit $?
+    start
+    ;;
+esac