From 0c4466b04058469fecdb0264c52ed9d9da9b0143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 27 Mar 2023 10:49:12 +0200 Subject: [PATCH] Namespace the smtp attributes --- .../kosmos-akkounts/recipes/default.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb index 24df181..c555f63 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb @@ -42,14 +42,16 @@ env = {} env[:rails_serve_static_files] = "true" smtp_server, smtp_port = smtp_credentials[:relayhost].split(":") -env[:smtp_server] = smtp_server -env[:smtp_port] = smtp_port -env[:smtp_login] = smtp_credentials[:user_name] -env[:smtp_password] = smtp_credentials[:password] -env[:smtp_from_address] = node['akkounts']['smtp']['from_address'] -env[:smtp_domain] = node['akkounts']['smtp']['domain'] -env[:smtp_auth_method] = node['akkounts']['smtp']['auth_method'] -env[:smtp_enable_starttls] = node['akkounts']['smtp']['enable_starttls'] +env[:smtp] = { + server: smtp_server, + port: smtp_port, + login: smtp_credentials[:user_name], + password: smtp_credentials[:password], + from_address: node['akkounts']['smtp']['from_address'], + domain: node['akkounts']['smtp']['domain'], + auth_method: node['akkounts']['smtp']['auth_method'], + enable_starttls: node['akkounts']['smtp']['enable_starttls'] +} if webhooks_allowed_ips.length > 0 env[:webhooks_allowed_ips] = webhooks_allowed_ips