Use cgimap from PPA rather than building from source.

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 74766e6e813cccf687e015c162a252828eb9102c..7fe4d800acc04c3087605299f00ff8609ecf8f84 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -130,6 +130,11 @@ apt_source "mediawiki" do
   key "90E9F83F22250DD7"
 end
 
   key "90E9F83F22250DD7"
 end
 

+apt_source "openstreetmap-cgimap" do
+  url "http://ppa.launchpad.net/zerebubuth/openstreetmap-cgimap/ubuntu"
+  key "CDADED50"
+end
+

 package "unattended-upgrades"
 
 if Dir.exist?("/usr/share/unattended-upgrades")
 package "unattended-upgrades"
 
 if Dir.exist?("/usr/share/unattended-upgrades")

diff --git a/cookbooks/web/attributes/default.rb b/cookbooks/web/attributes/default.rb
index 8ad59e5440da90c27e221518b68e409c94f96424..540ec54d57928e8ed33b87951b6ee5506ac7bc2b 100644 (file)
--- a/cookbooks/web/attributes/default.rb
+++ b/cookbooks/web/attributes/default.rb
@@ -1,3 +1,6 @@
 default[:web][:base_directory] = "/srv/www.openstreetmap.org"
 default[:web][:pid_directory] = "/var/run/web"
 default[:web][:log_directory] = "/var/log/web"
 default[:web][:base_directory] = "/srv/www.openstreetmap.org"
 default[:web][:pid_directory] = "/var/run/web"
 default[:web][:log_directory] = "/var/log/web"

+
+# need the APT source for cgimap to be able to install the package
+default[:apt][:sources] = node[:apt][:sources] | ["openstreetmap-cgimap"]

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"))
 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"
 depends           "apache"
 depends           "passenger"
 depends           "git"


@@ -12,3 +12,5 @@ depends           "memcached"
 depends           "nodejs"
 depends           "tools"
 depends           "nfs"
 depends           "nodejs"
 depends           "tools"
 depends           "nfs"

+depends           "accounts"
+depends           "apt"

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 6b70cb702e721407a5277a5c5faf6a2aeb7e1e67..28bcf76790850e2e8eaa46b08a7b5ed8d483e75c 100644 (file)
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -17,13 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:nfs]["/store/rails"] = {
-  :host => node[:web][:fileserver],
-  :path => "/store/rails"
-}
-
-include_recipe "nfs"
-

 directory node[:web][:base_directory] do
   group "rails"
   mode 0o2775
 directory node[:web][:base_directory] do
   group "rails"
   mode 0o2775

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 2adb9d099e0cbdb19301dc6656bd0009b0a718dc..a761f6fff8e0799498bb744a6ac23b5123eccc22 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -22,98 +22,14 @@ include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
 
 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"
+package "openstreetmap-cgimap-bin"

 
 

-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
-
-if node[:web][:readonly_database_host]
-  database_host = node[:web][:readonly_database_host]
-  database_readonly = true
-else
-  database_host = node[:web][:database_host]
-  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
-
-file "/etc/init.d/cgimap" do
+template "/etc/init.d/cgimap" do

   owner "root"
   group "root"
   mode 0o755
   owner "root"
   group "root"
   mode 0o755

-  content cgimap_init
+  source "cgimap.init.erb"
+  variables :db_password => db_passwords['rails']

 end
 
 if %w(database_offline api_offline).include?(node[:web][:status])
 end
 
 if %w(database_offline api_offline).include?(node[:web][:status])


@@ -124,7 +40,7 @@ else
   service "cgimap" do
     action [:enable, :start]
     supports :restart => true, :reload => true
   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
     subscribes :restart, "file[/etc/init.d/cgimap]"
   end
 end

diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index 7806530d97f9c216ce2327e71593ce5c1195e2aa..791c3fe2fc56f4396051e08c0fd24a46b428114b 100644 (file)
--- a/cookbooks/web/recipes/gpx.rb
+++ b/cookbooks/web/recipes/gpx.rb
@@ -18,6 +18,7 @@
 #
 
 include_recipe "web::base"
 #
 
 include_recipe "web::base"

+include_recipe "web::nfs"

 
 db_passwords = data_bag_item("db", "passwords")
 
 
 db_passwords = data_bag_item("db", "passwords")
 

diff --git a/cookbooks/web/recipes/nfs.rb b/cookbooks/web/recipes/nfs.rb
new file mode 100644 (file)
index 0000000..1ca1312
--- /dev/null
+++ b/cookbooks/web/recipes/nfs.rb
@@ -0,0 +1,25 @@
+#
+# Cookbook Name:: web
+# Recipe:: nfs
+#
+# Copyright 2011, OpenStreetMap Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+node.set[:nfs]["/store/rails"] = {
+  :host => node[:web][:fileserver],
+  :path => "/store/rails"
+}
+
+include_recipe "nfs"

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 52aa09625c447bcd3377025ea4f3e742d84f3e2b..848ac239d334601f553fa2e3ba27134ef5ca7aa9 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -19,6 +19,7 @@
 
 include_recipe "tools"
 include_recipe "web::base"
 
 include_recipe "tools"
 include_recipe "web::base"

+include_recipe "web::nfs"

 
 include_recipe "apache"
 include_recipe "passenger"
 
 include_recipe "apache"
 include_recipe "passenger"

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..a2b25d2
--- /dev/null
+++ b/cookbooks/web/templates/default/cgimap.init.erb
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+<%
+pid_directory = node[:web][:pid_directory]
+log_directory = node[:web][:log_directory]
+
+if node[:web][:readonly_database_host]
+  database_host = node[:web][:readonly_database_host]
+  database_readonly = true
+else
+  database_host = node[:web][:database_host]
+  database_readonly = node[:web][:status] == "database_readonly"
+end
+
+memcached_servers = node[:web][:memcached_servers] || []
+%>
+
+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 -- --daemon --port=8000 --instances=30 --pidfile $CGIMAP_PIDFILE
+}
+
+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