Add new SMTP config for akkounts #480

Merged
raucao merged 4 commits from feature/479-akkounts_smtp_config into master 2023-03-27 09:56:16 +00:00
Showing only changes of commit 0c4466b040 - Show all commits

View File

@ -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']
greg marked this conversation as resolved Outdated

I think the template supports automatic namespacing. I.e. we should be able to do this:

env[:smtp] = {
  server: smtp_server,
  port: smtp_port,
  login: smtp_credentials[:user_name]
}

... and it should expand to uppercase keys like SMTP_SERVER.

I think the template supports automatic namespacing. I.e. we should be able to do this: ```ruby env[:smtp] = { server: smtp_server, port: smtp_port, login: smtp_credentials[:user_name] } ``` ... and it should expand to uppercase keys like `SMTP_SERVER`.
}
if webhooks_allowed_ips.length > 0
env[:webhooks_allowed_ips] = webhooks_allowed_ips