X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8dddf4e274d403d5758f6773e856c79adac5aed5..1d23c59f10b2636d9c20b3da441aa22373f88af4:/cookbooks/web/recipes/cgimap.rb

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 26fb2c41d..2adb9d099 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"
@@ -86,7 +86,7 @@ else
   database_readonly = node[:web][:status] == "database_readonly"
 end
 
-backends = node[:web][:backends]
+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};")
@@ -95,12 +95,12 @@ cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line|
   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=#{backends.join(',')};")
+  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")
@@ -112,7 +112,7 @@ end
 file "/etc/init.d/cgimap" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   content cgimap_init
 end