Namespace the smtp attributes

environments/production.json

@@ -2,12 +2,6 @@
   "name": "production",
   "override_attributes": {
     "akkounts": {
-      "smtp": {
-        "from_address": "accounts <accounts@kosmos.org>",
-        "domain": "kosmos.org",
-        "auth_method": "plain",
-        "enable_starttls": "auto"
-      },
       "lndhub": {
         "public_url": "https://lndhub.kosmos.org",
         "public_key": "024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946"

site-cookbooks/kosmos-akkounts/attributes/default.rb

@@ -10,7 +10,7 @@ node.default['akkounts']['lndhub']['public_url'] = nil
 node.default['akkounts']['lndhub']['public_key'] = nil
 node.default['akkounts']['lndhub']['postgres_db'] = 'lndhub'
 
-node.default['akkounts']['smtp']['from_address']    = 'accounts <accounts@kosmos.org>'
+node.default['akkounts']['smtp']['from_address']    = 'Kosmos Accounts <accounts@kosmos.org>'
 node.default['akkounts']['smtp']['domain']          = 'kosmos.org'
 node.default['akkounts']['smtp']['auth_method']     = 'plain'
 node.default['akkounts']['smtp']['enable_starttls'] = 'auto'

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