Namespace the smtp attributes
This commit is contained in:
parent
34970fe3cf
commit
0c4466b040
@ -42,14 +42,16 @@ env = {}
|
|||||||
env[:rails_serve_static_files] = "true"
|
env[:rails_serve_static_files] = "true"
|
||||||
|
|
||||||
smtp_server, smtp_port = smtp_credentials[:relayhost].split(":")
|
smtp_server, smtp_port = smtp_credentials[:relayhost].split(":")
|
||||||
env[:smtp_server] = smtp_server
|
env[:smtp] = {
|
||||||
env[:smtp_port] = smtp_port
|
server: smtp_server,
|
||||||
env[:smtp_login] = smtp_credentials[:user_name]
|
port: smtp_port,
|
||||||
env[:smtp_password] = smtp_credentials[:password]
|
login: smtp_credentials[:user_name],
|
||||||
env[:smtp_from_address] = node['akkounts']['smtp']['from_address']
|
password: smtp_credentials[:password],
|
||||||
env[:smtp_domain] = node['akkounts']['smtp']['domain']
|
from_address: node['akkounts']['smtp']['from_address'],
|
||||||
env[:smtp_auth_method] = node['akkounts']['smtp']['auth_method']
|
domain: node['akkounts']['smtp']['domain'],
|
||||||
env[:smtp_enable_starttls] = node['akkounts']['smtp']['enable_starttls']
|
auth_method: node['akkounts']['smtp']['auth_method'],
|
||||||
|
enable_starttls: node['akkounts']['smtp']['enable_starttls']
|
||||||
|
}
|
||||||
|
|
||||||
if webhooks_allowed_ips.length > 0
|
if webhooks_allowed_ips.length > 0
|
||||||
env[:webhooks_allowed_ips] = webhooks_allowed_ips
|
env[:webhooks_allowed_ips] = webhooks_allowed_ips
|
||||||
|
Loading…
x
Reference in New Issue
Block a user