X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/eab36a9bcc201a289549bf0d4a4c456bbb150445..f87f325f578da8a21eaaf6a73e69db00f4347161:/cookbooks/web/recipes/cgimap.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 61d1162b1..22d6d02f0 100644 --- 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. @@ -28,7 +28,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 +46,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(","),