X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/web/recipes/cgimap.rb diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index e8f817119..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. @@ -43,9 +43,10 @@ systemd_service "cgimap" do type "forking" environment_file "CGIMAP_HOST" => database_host, "CGIMAP_DBNAME" => "openstreetmap", - "CGIMAP_USERNAME" => "rails", - "CGIMAP_PASSWORD" => db_passwords["rails"], + "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(","),