From 3d9b73d7e89d4b4266840a2f5fb7f90061d5c1b6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 22 Mar 2017 18:50:11 +0000 Subject: [PATCH] Configure email addresses explicitly for rails port instances --- cookbooks/web/definitions/rails_port.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index a9a6590db..fe60c1c64 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -28,6 +28,7 @@ define :rails_port, :action => [:create, :enable] do rails_repository = params[:repository] || "git://git.openstreetmap.org/rails.git" rails_revision = params[:revision] || "live" run_migrations = params[:run_migrations] || false + email_from = params[:email_from] || "OpenStreetMap " status = params[:status] || "online" database_params = { @@ -114,10 +115,14 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#publisher_url:.*$/, "\\1publisher_url: \"https://plus.google.com/111953119785824514010\"") + line.gsub!(/^( *)support_email:.*$/, "\\1support_email: \"support@openstreetmap.org\"") + if params[:email_from] - line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{params[:email_from]}\"") + line.gsub!(/^( *)email_from:.*$/, "\\1email_from: \"#{email_from}\"") end + line.gsub!(/^( *)email_return_path:.*$/, "\\1email_return_path: \"bounces@openstreetmap.org\"") + line.gsub!(/^( *)status:.*$/, "\\1status: :#{status}") if params[:messages_domain] -- 2.43.2