From 8f5811af5959d0eec0b39b3b60c6440d1e59e800 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Tue, 12 Nov 2024 15:37:54 +0100 Subject: [PATCH 01/12] edited gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c05a2892..920d3863 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'paper_trail', '~> 14.0' gem 'paranoia', '~> 3.0' gem 'pg', '~> 1.0' gem 'phonelib' -gem 'puma', '~> 6.0' +gem 'puma', '~> 6.4.3' gem 'pundit', '~> 2.0' gem 'rack-attack', '~> 6.0' gem 'rack-cors', '~> 2.0', '>= 2.0.1', require: 'rack/cors' From becae3580403f46a046e6e742ccfb16f4414e86c Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Tue, 12 Nov 2024 15:44:34 +0100 Subject: [PATCH 02/12] update format --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 920d3863..f3bfbfe6 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'paper_trail', '~> 14.0' gem 'paranoia', '~> 3.0' gem 'pg', '~> 1.0' gem 'phonelib' -gem 'puma', '~> 6.4.3' +gem 'puma', '~> 6.4' , '>= 6.4.3' gem 'pundit', '~> 2.0' gem 'rack-attack', '~> 6.0' gem 'rack-cors', '~> 2.0', '>= 2.0.1', require: 'rack/cors' From f979180ae807297dbc51e653cf6a4222e5d35b87 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Tue, 12 Nov 2024 16:31:41 +0100 Subject: [PATCH 03/12] Intitial Commit --- Gemfile.lock | 2 +- app/mailers/application_mailer.rb | 2 +- app/mailers/mail_smtp_mailer.rb | 4 ++-- app/mailers/user_cleanup_mailer.rb | 2 +- app/mailers/user_export_mailer.rb | 2 +- app/views/mail_bounce_mailer/address_unknown.html.erb | 2 +- app/views/mail_bounce_mailer/mail_bounced.html.erb | 3 ++- app/views/user_cleanup_mailer/cleanup_email.erb | 2 +- config/application.rb | 5 +++++ spec/jobs/smtp_job_spec.rb | 4 ++-- spec/jobs/user_cleanup_job_spec.rb | 3 +-- spec/jobs/user_export_mailer_job_spec.rb | 2 +- 12 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ffc816f9..9bfc88b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -575,7 +575,7 @@ DEPENDENCIES phonelib pry-byebug pry-rails - puma (~> 6.0) + puma (~> 6.4, >= 6.4.3) pundit (~> 2.0) rack-attack (~> 6.0) rack-cors (~> 2.0, >= 2.0.1) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 529e5da1..7c76a405 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: 'no-reply@csvalpha.nl' + default from: Rails.application.config.x.noreply_email layout 'mailer' end diff --git a/app/mailers/mail_smtp_mailer.rb b/app/mailers/mail_smtp_mailer.rb index de9035ef..81643706 100644 --- a/app/mailers/mail_smtp_mailer.rb +++ b/app/mailers/mail_smtp_mailer.rb @@ -12,14 +12,14 @@ def enabled_email(mail_alias, password) # since we do not want to send the password to mail management def notify_management_enable_email(mail_alias) @mail_alias = mail_alias - mail to: 'mailbeheer@csvalpha.nl', + mail to: Rails.application.config.x.mailbeheer_email, subject: "SMTP account voor #{mail_alias.email} aangemaakt" end # Mail to notify the user and mail management that their SMTP is removed def disabled_email(mail_alias) @mail_alias = mail_alias - mail to: 'mailbeheer@csvalpha.nl', bcc: mail_alias.mail_addresses, + mail to: Rails.application.config.x.mailbeheer_email, bcc: mail_alias.mail_addresses, subject: "SMTP account voor #{mail_alias.email} opgeheven" end end diff --git a/app/mailers/user_cleanup_mailer.rb b/app/mailers/user_cleanup_mailer.rb index 54b29b37..c4dc77de 100644 --- a/app/mailers/user_cleanup_mailer.rb +++ b/app/mailers/user_cleanup_mailer.rb @@ -6,6 +6,6 @@ def cleanup_email(will_archive_users, archived_users) ' staan op het punt gearchiveerd te worden' subject = 'Er zijn gebruikers gearchiveerd!' if @will_archive_users.empty? - mail to: 'ict@csvalpha.nl;bestuur@csvalpha.nl', subject: + mail to: Rails.application.config.x.privacy_email, subject: end end diff --git a/app/mailers/user_export_mailer.rb b/app/mailers/user_export_mailer.rb index abed5cbd..a9433b5b 100644 --- a/app/mailers/user_export_mailer.rb +++ b/app/mailers/user_export_mailer.rb @@ -4,6 +4,6 @@ def privacy_notification_email(exporting_user, group, fields, description) @group = group @fields = fields @description = description - mail to: 'privacy@csvalpha.nl', subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts + mail to: Rails.application.config.x.privacy_email, subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts end end diff --git a/app/views/mail_bounce_mailer/address_unknown.html.erb b/app/views/mail_bounce_mailer/address_unknown.html.erb index ab441ae7..793b56a3 100644 --- a/app/views/mail_bounce_mailer/address_unknown.html.erb +++ b/app/views/mail_bounce_mailer/address_unknown.html.erb @@ -1,4 +1,4 @@ U heeft geprobeerd een mail te versturen naar een @csvalpha.nl mailadres. Deze kan helaas niet bezorgd worden. Het gebruikte mailadres <%= @to %> is namelijk niet in gebruik. Controleer het mailadres nogmaals.

-Mocht u zeker zijn dat het mailadres klopt of niet weten welk mailadres u moet gebruiken kunt u mailen naar abactis@csvalpha.nl +Mocht u zeker zijn dat het mailadres klopt of niet weten welk mailadres u moet gebruiken kunt u mailen naar <%= Rails.application.config.x.mailbeheer_email %> diff --git a/app/views/mail_bounce_mailer/mail_bounced.html.erb b/app/views/mail_bounce_mailer/mail_bounced.html.erb index e7b4ce67..daad768b 100644 --- a/app/views/mail_bounce_mailer/mail_bounced.html.erb +++ b/app/views/mail_bounce_mailer/mail_bounced.html.erb @@ -1,4 +1,5 @@ Uw bericht met als onderwerp "<%= @subject %>" aan "<%= @to %>" is helaas niet succesvol afgeleverd.
De reden hiervoor is: <%= @reason %>. Mocht dit een bericht aan een mailgroep zijn kan het ook zijn dat het bericht maar bij één ontvanger niet is aangekomen.

-Voor meer vragen kunt u mailen naar mailbeheer@csvalpha.nl +Voor meer vragen kunt u mailen naar <%= Rails.application.config.x.ict_email %> + diff --git a/app/views/user_cleanup_mailer/cleanup_email.erb b/app/views/user_cleanup_mailer/cleanup_email.erb index d1af789b..235c96e5 100644 --- a/app/views/user_cleanup_mailer/cleanup_email.erb +++ b/app/views/user_cleanup_mailer/cleanup_email.erb @@ -8,7 +8,7 @@ - <%= user.full_name %> <% end %>

- Vergeet niet de lidmaatschapsformulieren van deze leden te vernietigd. Als dit gebeurd is zouden we dan op de hoogte kunnen worden gebracht door middel van een mailtje naar privacy@csvalpha.nl. + Vergeet niet de lidmaatschapsformulieren van deze leden te vernietigd. Als dit gebeurd is zouden we dan op de hoogte kunnen worden gebracht door middel van een mailtje naar <%= Rails.application.config.x.privacy_email %>. <% end %>
diff --git a/config/application.rb b/config/application.rb index 18efd06c..a3801522 100644 --- a/config/application.rb +++ b/config/application.rb @@ -81,5 +81,10 @@ class Application < Rails::Application config.x.google_api_key = credentials.dig(Rails.env.to_sym, :google_api_key) config.x.healthcheck_ids = credentials.dig(Rails.env.to_sym, :healthcheck_ids) + + config.x.noreply_email = ENV.fetch('NOREPLY_EMAIL', 'noreply@example.com') + config.x.ict_email = ENV.fetch('ICT_EMAIL', 'ict@csvalpha.com') + config.x.bestuur_email = ENV.fetch('BESTUUR_EMAIL', 'bestuur@example.com') + config.x.privacy_email = ENV.fetch('PRIVACY_EMAIL', 'privacy@example.com') end end diff --git a/spec/jobs/smtp_job_spec.rb b/spec/jobs/smtp_job_spec.rb index 247b798f..37867317 100644 --- a/spec/jobs/smtp_job_spec.rb +++ b/spec/jobs/smtp_job_spec.rb @@ -25,7 +25,7 @@ it { expect(mail.bcc).to eq mail_alias.mail_addresses } it { expect(mail.subject).to eq "Je kunt nu mail versturen vanaf #{mail_alias.email}!" } - it { expect(management_mail.to).to eq ['mailbeheer@csvalpha.nl'] } + it { expect(management_mail.to).to eq [Rails.application.config.x.mailbeheer_email] } it { expect(management_mail.subject).to eq "SMTP account voor #{mail_alias.email} aangemaakt" @@ -47,7 +47,7 @@ it { expect(client).to have_received(:delete_smtp) } it { expect(mail.bcc).to eq mail_alias.mail_addresses } - it { expect(mail.to).to eq ['mailbeheer@csvalpha.nl'] } + it { expect(mail.to).to eq [Rails.application.config.x.mailbeheer_email] } it { expect(mail.subject).to eq "SMTP account voor #{mail_alias.email} opgeheven" } end end diff --git a/spec/jobs/user_cleanup_job_spec.rb b/spec/jobs/user_cleanup_job_spec.rb index e86fd21f..97d49b68 100644 --- a/spec/jobs/user_cleanup_job_spec.rb +++ b/spec/jobs/user_cleanup_job_spec.rb @@ -35,8 +35,7 @@ context 'when with will archive and archived users' do it { expect(ActionMailer::Base.deliveries.count).to eq 1 } - it { expect(email.to).to include 'bestuur@csvalpha.nl' } - it { expect(email.to).to include 'ict@csvalpha.nl' } + it { expect(email.to).to include Rails.application.config.x.privacy_email } it { expect(email.body.to_s).to include(almost_archive_user.full_name) } it { expect(email.body.to_s).not_to include(user.full_name) } it { expect(email.body.to_s).to include('Er is 1 gebruiker gearchiveerd.') } diff --git a/spec/jobs/user_export_mailer_job_spec.rb b/spec/jobs/user_export_mailer_job_spec.rb index 908c9992..336b4c34 100644 --- a/spec/jobs/user_export_mailer_job_spec.rb +++ b/spec/jobs/user_export_mailer_job_spec.rb @@ -18,7 +18,7 @@ end it { expect(ActionMailer::Base.deliveries.count).to eq 1 } - it { expect(privacy_notification_email.to.first).to eq 'privacy@csvalpha.nl' } + it { expect(privacy_notification_email.to.first).to eq Rails.application.config.x.privacy_email } it { expect(privacy_notification_email.body.to_s).to include(exporting_user.full_name) } it { expect(privacy_notification_email.body.to_s).to include(group.name) } it { expect(privacy_notification_email.body.to_s).to include(fields.join(', ')) } From b9ca75ae0d7a5be6c3102e7cbd791b06c97cf4d4 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Tue, 12 Nov 2024 16:39:59 +0100 Subject: [PATCH 04/12] edit application.rb --- app/jobs/user_archive_job.rb | 2 +- app/views/mail_bounce_mailer/address_unknown.html.erb | 2 +- config/application.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/jobs/user_archive_job.rb b/app/jobs/user_archive_job.rb index ca30af5c..def0fcd2 100644 --- a/app/jobs/user_archive_job.rb +++ b/app/jobs/user_archive_job.rb @@ -20,7 +20,7 @@ def create_global_archive_user User.create!(id: ARCHIVE_USER_ID, username: 'archived.user', - email: 'ict@csvalpha.nl', + email: <%= Rails.application.config.x.ict_email %>, first_name: 'Gearchiveerde', last_name: 'Gebruiker', address: 'Onbekend', diff --git a/app/views/mail_bounce_mailer/address_unknown.html.erb b/app/views/mail_bounce_mailer/address_unknown.html.erb index 793b56a3..c8e5e6e2 100644 --- a/app/views/mail_bounce_mailer/address_unknown.html.erb +++ b/app/views/mail_bounce_mailer/address_unknown.html.erb @@ -1,4 +1,4 @@ U heeft geprobeerd een mail te versturen naar een @csvalpha.nl mailadres. Deze kan helaas niet bezorgd worden. Het gebruikte mailadres <%= @to %> is namelijk niet in gebruik. Controleer het mailadres nogmaals.

-Mocht u zeker zijn dat het mailadres klopt of niet weten welk mailadres u moet gebruiken kunt u mailen naar <%= Rails.application.config.x.mailbeheer_email %> +Mocht u zeker zijn dat het mailadres klopt of niet weten welk mailadres u moet gebruiken kunt u mailen naar <%= Rails.application.config.x.ict_email %> diff --git a/config/application.rb b/config/application.rb index a3801522..931160ce 100644 --- a/config/application.rb +++ b/config/application.rb @@ -82,9 +82,9 @@ class Application < Rails::Application config.x.healthcheck_ids = credentials.dig(Rails.env.to_sym, :healthcheck_ids) - config.x.noreply_email = ENV.fetch('NOREPLY_EMAIL', 'noreply@example.com') + config.x.noreply_email = ENV.fetch('NOREPLY_EMAIL', 'no-reply@example.com') config.x.ict_email = ENV.fetch('ICT_EMAIL', 'ict@csvalpha.com') - config.x.bestuur_email = ENV.fetch('BESTUUR_EMAIL', 'bestuur@example.com') config.x.privacy_email = ENV.fetch('PRIVACY_EMAIL', 'privacy@example.com') + config.x.mailbeheer_email = ENV.fetch('PRIVACY_EMAIL', 'mailbeheer@example.com') end end From ce175fce0dcfb75f9354767dcf1254200cd52ebd Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:44:37 +0100 Subject: [PATCH 05/12] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f3bfbfe6..c05a2892 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'paper_trail', '~> 14.0' gem 'paranoia', '~> 3.0' gem 'pg', '~> 1.0' gem 'phonelib' -gem 'puma', '~> 6.4' , '>= 6.4.3' +gem 'puma', '~> 6.0' gem 'pundit', '~> 2.0' gem 'rack-attack', '~> 6.0' gem 'rack-cors', '~> 2.0', '>= 2.0.1', require: 'rack/cors' From 534028f55224305fa4f63c31d1c58577fc58b6a4 Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:45:20 +0100 Subject: [PATCH 06/12] Update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9bfc88b4..c9f93543 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -318,7 +318,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (6.4.3) + puma (6.0) nio4r (~> 2.0) puma (6.4.3-java) nio4r (~> 2.0) From 818e3df9639723701f6a59859d71aff9dace163e Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:46:10 +0100 Subject: [PATCH 07/12] Update Gemfile.lock --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c9f93543..16075599 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,4 @@ -GIT +FpumaGIT remote: https://github.com/csvalpha/dav4rack.git revision: 8541e53876d7a49a1c2d318e698f9dae88439e89 ref: 8541e53 @@ -318,7 +318,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (6.0) + puma (6.4.3) nio4r (~> 2.0) puma (6.4.3-java) nio4r (~> 2.0) @@ -575,7 +575,7 @@ DEPENDENCIES phonelib pry-byebug pry-rails - puma (~> 6.4, >= 6.4.3) + puma (~> 6.0) pundit (~> 2.0) rack-attack (~> 6.0) rack-cors (~> 2.0, >= 2.0.1) From d950c34a0f1fc9bdd675f658aad16755344c6da2 Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:46:31 +0100 Subject: [PATCH 08/12] Update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 16075599..ffc816f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,4 @@ -FpumaGIT +GIT remote: https://github.com/csvalpha/dav4rack.git revision: 8541e53876d7a49a1c2d318e698f9dae88439e89 ref: 8541e53 From 7217221fc3f4731d6d3e2f1990849092da830306 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Tue, 12 Nov 2024 17:22:44 +0100 Subject: [PATCH 09/12] fixed lint & tests --- app/jobs/user_archive_job.rb | 2 +- app/mailers/user_export_mailer.rb | 3 ++- spec/jobs/user_export_mailer_job_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/jobs/user_archive_job.rb b/app/jobs/user_archive_job.rb index def0fcd2..06b27632 100644 --- a/app/jobs/user_archive_job.rb +++ b/app/jobs/user_archive_job.rb @@ -20,7 +20,7 @@ def create_global_archive_user User.create!(id: ARCHIVE_USER_ID, username: 'archived.user', - email: <%= Rails.application.config.x.ict_email %>, + email: Rails.application.config.x.ict_email, first_name: 'Gearchiveerde', last_name: 'Gebruiker', address: 'Onbekend', diff --git a/app/mailers/user_export_mailer.rb b/app/mailers/user_export_mailer.rb index a9433b5b..adcd013f 100644 --- a/app/mailers/user_export_mailer.rb +++ b/app/mailers/user_export_mailer.rb @@ -4,6 +4,7 @@ def privacy_notification_email(exporting_user, group, fields, description) @group = group @fields = fields @description = description - mail to: Rails.application.config.x.privacy_email, subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts + mail to: Rails.application.config.x.privacy_email, + subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts end end diff --git a/spec/jobs/user_export_mailer_job_spec.rb b/spec/jobs/user_export_mailer_job_spec.rb index 336b4c34..a82f6ecc 100644 --- a/spec/jobs/user_export_mailer_job_spec.rb +++ b/spec/jobs/user_export_mailer_job_spec.rb @@ -18,7 +18,7 @@ end it { expect(ActionMailer::Base.deliveries.count).to eq 1 } - it { expect(privacy_notification_email.to.first).to eq Rails.application.config.x.privacy_email } + it { expect(privacy_notification_email.to).to eq [Rails.application.config.x.privacy_email] } it { expect(privacy_notification_email.body.to_s).to include(exporting_user.full_name) } it { expect(privacy_notification_email.body.to_s).to include(group.name) } it { expect(privacy_notification_email.body.to_s).to include(fields.join(', ')) } From eedc555369efa95451756207d7ca9df111921ae0 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Tue, 12 Nov 2024 17:53:38 +0100 Subject: [PATCH 10/12] fixed lint --- app/mailers/user_export_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/user_export_mailer.rb b/app/mailers/user_export_mailer.rb index adcd013f..cb72b36e 100644 --- a/app/mailers/user_export_mailer.rb +++ b/app/mailers/user_export_mailer.rb @@ -4,7 +4,7 @@ def privacy_notification_email(exporting_user, group, fields, description) @group = group @fields = fields @description = description - mail to: Rails.application.config.x.privacy_email, + mail to: Rails.application.config.x.privacy_email, subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts end end From ee626b997cfe618e10ea7d53ece239f46d82c5c7 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Wed, 13 Nov 2024 02:49:05 +0100 Subject: [PATCH 11/12] fixed lint final --- app/mailers/user_export_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/user_export_mailer.rb b/app/mailers/user_export_mailer.rb index cb72b36e..9f1d53de 100644 --- a/app/mailers/user_export_mailer.rb +++ b/app/mailers/user_export_mailer.rb @@ -5,6 +5,6 @@ def privacy_notification_email(exporting_user, group, fields, description) @fields = fields @description = description mail to: Rails.application.config.x.privacy_email, - subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts + subject: '[Privacy] Er is een database-export gemaakt' # rubocop:disable Rails/I18nLocaleTexts end end From 84b5ede03b86ebde5ba88981da7c35c25028c756 Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Wed, 13 Nov 2024 02:50:48 +0100 Subject: [PATCH 12/12] edited .env to @csvalpha.nl adresses --- config/application.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/application.rb b/config/application.rb index 931160ce..7158b5ae 100644 --- a/config/application.rb +++ b/config/application.rb @@ -82,9 +82,9 @@ class Application < Rails::Application config.x.healthcheck_ids = credentials.dig(Rails.env.to_sym, :healthcheck_ids) - config.x.noreply_email = ENV.fetch('NOREPLY_EMAIL', 'no-reply@example.com') + config.x.noreply_email = ENV.fetch('NOREPLY_EMAIL', 'no-reply@csvalpha.com') config.x.ict_email = ENV.fetch('ICT_EMAIL', 'ict@csvalpha.com') - config.x.privacy_email = ENV.fetch('PRIVACY_EMAIL', 'privacy@example.com') - config.x.mailbeheer_email = ENV.fetch('PRIVACY_EMAIL', 'mailbeheer@example.com') + config.x.privacy_email = ENV.fetch('PRIVACY_EMAIL', 'privacy@csvalpha.com') + config.x.mailbeheer_email = ENV.fetch('PRIVACY_EMAIL', 'mailbeheer@csvalpha.com') end end