Make users-agreed a template

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 365c2b5600b87d93cc8987886bb4c0c9a181e6bc..9dd97a49e9296eca51a4892e97361491985d94aa 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -22,10 +22,12 @@ 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 "gcc"
 package "make"
 package "autoconf"
 package "automake"

+package "libtool"

 package "libfcgi-dev"
 package "libxml2-dev"
 package "libmemcached-dev"
 package "libfcgi-dev"
 package "libxml2-dev"
 package "libmemcached-dev"


@@ -33,6 +35,7 @@ package "libboost-regex-dev"
 package "libboost-system-dev"
 package "libboost-program-options-dev"
 package "libboost-date-time-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"
 
 package "libpqxx3-dev"
 package "zlib1g-dev"
 


@@ -83,6 +86,8 @@ else
   database_readonly = node[:web][:status] == "database_readonly"
 end
 
   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;")
 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;")


@@ -90,7 +95,10 @@ 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_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_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{/home/rails/bin/map}, "#{cgimap_directory}/map")
 
 
   line.gsub!(%r{/home/rails/bin/map}, "#{cgimap_directory}/map")