kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

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
Conversation 2 Commits 4 Files Changed 2 +23 -5
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
site-cookbooks/kosmos-akkounts/attributes/default.rb
View File

@ -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>'
greg marked this conversation as resolved Outdated
raucao commented 2023-03-24 23:19:49 +00:00
Outdated
Review
Copy Link

I think just a lowercase "accounts" without context would probably be a bit weird in an email inbox. How about "Kosmos Accounts" for example?

I think just a lowercase "accounts" without context would probably be a bit weird in an email inbox. How about "Kosmos Accounts" for example?
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"

23
site-cookbooks/kosmos-akkounts/recipes/default.rb
View File

@ -4,11 +4,12 @@
# #
require 'ipaddr' require 'ipaddr'
app_name = "akkounts" app_name = "akkounts"
deploy_user = "deploy" 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']
greg marked this conversation as resolved Outdated
raucao commented 2023-03-24 23:18:18 +00:00
Outdated
Review
Copy Link

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 if webhooks_allowed_ips.length > 0
env[:webhooks_allowed_ips] = webhooks_allowed_ips env[:webhooks_allowed_ips] = webhooks_allowed_ips
end end