From 1bbf168adeb441a549a9b6b173bfad44cef4c460 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 24 Jun 2016 19:59:48 +0100 Subject: [PATCH] Update to cgimap 0.4.3 --- cookbooks/web/recipes/cgimap.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 9dd97a49e..067b9e3f5 100644 --- a/cookbooks/web/recipes/cgimap.rb +++ b/cookbooks/web/recipes/cgimap.rb @@ -36,7 +36,7 @@ package "libboost-system-dev" package "libboost-program-options-dev" package "libboost-date-time-dev" package "libboost-filesystem-dev" -package "libpqxx3-dev" +package "libpqxx-dev" package "zlib1g-dev" cgimap_directory = "#{node[:web][:base_directory]}/cgimap" @@ -98,9 +98,9 @@ cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line| 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/map}, "--pidfile $CGIMAP_PIDFILE") + line.gsub!(%r{--pidfile \$CGIMAP_PIDFILE --exec /home/rails/bin/openstreetmap-cgimap}, "--pidfile $CGIMAP_PIDFILE") - line.gsub!(%r{/home/rails/bin/map}, "#{cgimap_directory}/map") + line.gsub!(%r{/home/rails/bin/openstreetmap-cgimap}, "#{cgimap_directory}/openstreetmap-cgimap") if database_readonly line.gsub!(/--daemon/, "--daemon --readonly") -- 2.43.2