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

Compare commits

base: kosmos:4f1fb347a8ff9da7e61885969f1eb476f162fbb4
Branches Tags
kosmos:master kosmos:feature/blossom_server kosmos:bugfix/substr_url_matching kosmos:notes/ejabberd_ldap_photo kosmos:feature/akaunting kosmos:chore/ejabberd_service_avatar kosmos:feature/237-gitea_gpg
...
compare: kosmos:0c4466b04058469fecdb0264c52ed9d9da9b0143
Branches Tags
kosmos:feature/blossom_server kosmos:master kosmos:bugfix/substr_url_matching kosmos:notes/ejabberd_ldap_photo kosmos:feature/akaunting kosmos:chore/ejabberd_service_avatar kosmos:feature/237-gitea_gpg

3 Commits
4f1fb347a8 ... 0c4466b040

Author SHA1 Message Date
Greg Karékinian
0c4466b040 Namespace the smtp attributes 2023-03-27 10:49:12 +02:00
Greg Karékinian
34970fe3cf Set a better name for the from address 2023-03-27 10:48:56 +02:00
Greg Karékinian
3873ebaac2 Don't override the SMTP config with the same values 2023-03-27 10:45:02 +02:00
3 changed files with 11 additions and 15 deletions
Expand all files Collapse all files

6
environments/production.json
View File

@@ -2,12 +2,6 @@
"name": "production", "name": "production",
"override_attributes": { "override_attributes": {
"akkounts": { "akkounts": {
"smtp": {
"from_address": "accounts <accounts@kosmos.org>",
"domain": "kosmos.org",
"auth_method": "plain",
"enable_starttls": "auto"
},
"lndhub": { "lndhub": {
"public_url": "https://lndhub.kosmos.org", "public_url": "https://lndhub.kosmos.org",
"public_key": "024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946" "public_key": "024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946"

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

@@ -10,7 +10,7 @@ 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'] = 'accounts <accounts@kosmos.org>' node.default['akkounts']['smtp']['from_address'] = 'Kosmos Accounts <accounts@kosmos.org>'
node.default['akkounts']['smtp']['domain'] = 'kosmos.org' node.default['akkounts']['smtp']['domain'] = 'kosmos.org'
node.default['akkounts']['smtp']['auth_method'] = 'plain' node.default['akkounts']['smtp']['auth_method'] = 'plain'
node.default['akkounts']['smtp']['enable_starttls'] = 'auto' node.default['akkounts']['smtp']['enable_starttls'] = 'auto'

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

@@ -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