community: Disable maxmind download for now

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 380f2a8eb734f9f9a211e8042705029e5458714c..a75172b180e5797bbcff28b932869caad4382989 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -24,6 +24,10 @@ include_recipe "web::base"
 db_passwords = data_bag_item("db", "passwords")
 
 package "openstreetmap-cgimap-bin" do
+  action :purge
+end
+
+package "openstreetmap-cgimap" do
   action :install
 end
 
@@ -37,8 +41,6 @@ cgimap_options = {
   "CGIMAP_DBNAME" => "openstreetmap",
   "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(","),
@@ -56,6 +58,8 @@ cgimap_options = {
 
 if %w[database_readonly api_readonly].include?(node[:web][:status])
   cgimap_options["CGIMAP_DISABLE_API_WRITE"] = "true"
+else
+  cgimap_options["CGIMAP_UPDATE_HOST"] = node[:web][:database_host]
 end
 
 systemd_service "cgimap" do