Merge remote-tracking branch 'github/pull/349' into master

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 4c5a0cd8de188b33c4375001455a9815ce32393b..009b0a6d7548a06d828f1338d4b6c158b25cde75 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: cgimap
 #
 # Recipe:: cgimap
 #

-# Copyright 2011, OpenStreetMap Foundation
+# 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"

 include_recipe "tools"
 include_recipe "web::base"
 
 include_recipe "tools"
 include_recipe "web::base"
 


@@ -26,18 +27,10 @@ package "openstreetmap-cgimap-bin" do
   action :upgrade
 end
 
   action :upgrade
 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
+database_host = node[:web][:readonly_database_host] || node[:web][:database_host]

 
 memcached_servers = node[:web][:memcached_servers] || []
 
 
 memcached_servers = node[:web][:memcached_servers] || []
 

-switches = database_readonly ? " --readonly" : ""
-

 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"


@@ -46,13 +39,14 @@ systemd_service "cgimap" do
                    "CGIMAP_USERNAME" => "cgimap",
                    "CGIMAP_PASSWORD" => db_passwords["cgimap"],
                    "CGIMAP_OAUTH_HOST" => node[:web][:database_host],
                    "CGIMAP_USERNAME" => "cgimap",
                    "CGIMAP_PASSWORD" => db_passwords["cgimap"],
                    "CGIMAP_OAUTH_HOST" => node[:web][:database_host],

+                   "CGIMAP_UPDATE_HOST" => node[:web][:database_host],

                    "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
                    "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",
                    "CGIMAP_MEMCACHE" => memcached_servers.join(","),
                    "CGIMAP_RATELIMIT" => "204800",
                    "CGIMAP_MAXDEBT" => "250"
   user "rails"
                    "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
                    "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",
                    "CGIMAP_MEMCACHE" => memcached_servers.join(","),
                    "CGIMAP_RATELIMIT" => "204800",
                    "CGIMAP_MAXDEBT" => "250"
   user "rails"

-  exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30#{switches}"
+  exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30"

   exec_reload "/bin/kill -HUP $MAINPID"
   private_tmp true
   private_devices true
   exec_reload "/bin/kill -HUP $MAINPID"
   private_tmp true
   private_devices true