Add test for serverinfo cookbook

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 61d1162b1cab711bade231cd874a0b0198eb2bd1..ba9799c4c7685e91c6d253fd5da73f992d0c0409 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
 #
-# 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.
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
 include_recipe "tools"
 include_recipe "web::base"
 
@@ -28,7 +29,7 @@ end
 
 if node[:web][:readonly_database_host]
   database_host = node[:web][:readonly_database_host]
-  database_readonly = node[:web][:readonly_database_host] != node[:web][:database_host]
+  database_readonly = true
 else
   database_host = node[:web][:database_host]
   database_readonly = node[:web][:status] == "database_readonly"
@@ -46,6 +47,7 @@ systemd_service "cgimap" do
                    "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(","),