Merge pull request 'Add new SMTP config for akkounts' (#480) from feature/479-akkounts_smtp_config into master
Reviewed-on: #480
This commit is contained in:
commit
0fbba8baa8
@ -10,4 +10,9 @@ node.default['akkounts']['lndhub']['public_url'] = nil
|
|||||||
node.default['akkounts']['lndhub']['public_key'] = nil
|
node.default['akkounts']['lndhub']['public_key'] = nil
|
||||||
node.default['akkounts']['lndhub']['postgres_db'] = 'lndhub'
|
node.default['akkounts']['lndhub']['postgres_db'] = 'lndhub'
|
||||||
|
|
||||||
|
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'
|
||||||
|
|
||||||
node.override["redisio"]["version"] = "6.2.6"
|
node.override["redisio"]["version"] = "6.2.6"
|
||||||
|
@ -9,6 +9,7 @@ deploy_user = "deploy"
|
|||||||
deploy_group = "deploy"
|
deploy_group = "deploy"
|
||||||
deploy_path = "/opt/#{app_name}"
|
deploy_path = "/opt/#{app_name}"
|
||||||
credentials = Chef::EncryptedDataBagItem.load('credentials', app_name)
|
credentials = Chef::EncryptedDataBagItem.load('credentials', app_name)
|
||||||
|
smtp_credentials = Chef::EncryptedDataBagItem.load('credentials', 'smtp')
|
||||||
|
|
||||||
group deploy_group
|
group deploy_group
|
||||||
|
|
||||||
@ -40,6 +41,18 @@ env = {}
|
|||||||
|
|
||||||
env[:rails_serve_static_files] = "true"
|
env[:rails_serve_static_files] = "true"
|
||||||
|
|
||||||
|
smtp_server, smtp_port = smtp_credentials[:relayhost].split(":")
|
||||||
|
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
|
if webhooks_allowed_ips.length > 0
|
||||||
env[:webhooks_allowed_ips] = webhooks_allowed_ips
|
env[:webhooks_allowed_ips] = webhooks_allowed_ips
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user