X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/90a349e0bc558441e65156eabb585c578d93fbfd..07417174dc9d0271283aacbe20b1cd73ec374685:/cookbooks/web/recipes/cgimap.rb diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb index 8303955c2..ba9799c4c 100644 --- a/cookbooks/web/recipes/cgimap.rb +++ b/cookbooks/web/recipes/cgimap.rb @@ -1,14 +1,14 @@ # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "apt" include_recipe "tools" include_recipe "web::base" @@ -43,9 +44,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(","),