Merge pull request 'Configure/deploy akkounts for Discourse SSO' (#493) from chore/akkounts_upgrade into master

Reviewed-on: #493

site-cookbooks/kosmos-akkounts/attributes/default.rb

@@ -5,14 +5,16 @@ node.default['akkounts']['domain'] = 'accounts.kosmos.org'
 
 node.default['akkounts_api']['domain'] = 'api.kosmos.org'
 
-node.default['akkounts']['lndhub']['api_url'] = nil
-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']    = '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.default['akkounts']['discourse']['public_url'] = nil
+
+node.default['akkounts']['lndhub']['api_url'] = nil
+node.default['akkounts']['lndhub']['public_url'] = nil
+node.default['akkounts']['lndhub']['public_key'] = nil
+node.default['akkounts']['lndhub']['postgres_db'] = 'lndhub'
+
 node.override["redisio"]["version"] = "6.2.6"

site-cookbooks/kosmos-akkounts/recipes/default.rb

@@ -60,9 +60,14 @@ env[:sentry_dsn] = credentials["sentry_dsn"]
 if webhooks_allowed_ips.length > 0
   env[:webhooks_allowed_ips] = webhooks_allowed_ips
 end
+
 if btcpay_host
   env[:btcpay_api_url] = "http://#{btcpay_host}:23001/api/v1"
 end
+
+env[:discourse_public_url] = node['akkounts']['discourse']['public_url']
+env[:discourse_connect_secret] = credentials['discourse_connect_secret']
+
 if lndhub_host
   node.override["akkounts"]["lndhub"]["api_url"] = "http://#{lndhub_host}:3026"
   env[:lndhub_legacy_api_url] = node["akkounts"]["lndhub"]["api_url"]

site-cookbooks/kosmos_discourse/templates/nginx_conf.erb

@@ -27,6 +27,7 @@ server {
     proxy_buffers 1024 8k;
 
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto https;
 
     proxy_pass http://_discourse;
     proxy_http_version 1.1;