kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 29 Pull Requests 2 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 +27 -5
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4f1fb347a8 - Show all commits

6
environments/production.json
View File

@ -2,6 +2,12 @@
"name": "production",
"override_attributes": {
"akkounts": {
"smtp": {
"from_address": "accounts <accounts@kosmos.org>",
"domain": "kosmos.org",
"auth_method": "plain",
"enable_starttls": "auto"
},
greg marked this conversation as resolved Outdated
raucao commented 2023-03-24 23:15:36 +00:00
Outdated
Review
Copy Link

Why override the default values with the same values?

Why override the default values with the same values?
"lndhub": {
"public_url": "https://lndhub.kosmos.org",
"public_key": "024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946"

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']['postgres_db'] = 'lndhub'
node.default['akkounts']['smtp']['from_address'] = '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"

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

@ -4,11 +4,12 @@
#
require 'ipaddr'
app_name = "akkounts"
deploy_user = "deploy"
deploy_group = "deploy"
deploy_path = "/opt/#{app_name}"
credentials = Chef::EncryptedDataBagItem.load('credentials', app_name)
app_name = "akkounts"
deploy_user = "deploy"
deploy_group = "deploy"
deploy_path = "/opt/#{app_name}"
credentials = Chef::EncryptedDataBagItem.load('credentials', app_name)
smtp_credentials = Chef::EncryptedDataBagItem.load('credentials', 'smtp')
group deploy_group
@ -40,6 +41,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']
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
env[:webhooks_allowed_ips] = webhooks_allowed_ips
end