diff --git a/data_bags/credentials/akkounts.json b/data_bags/credentials/akkounts.json index cc0a979..7914b0d 100644 --- a/data_bags/credentials/akkounts.json +++ b/data_bags/credentials/akkounts.json @@ -1,30 +1,37 @@ { "id": "akkounts", "postgresql_username": { - "encrypted_data": "drHBdPcrH3BqlsVfWP/vL5Thok8Uub6JhjuU\n", - "iv": "n+08nhiHoK4jRVwd\n", - "auth_tag": "elB4rx8k+jj34iQepECQNA==\n", + "encrypted_data": "W+Ia820+uYCAED9LRkQ1ZVe//56GRS5u0HrG\n", + "iv": "NpuVENC7C5FCjsEz\n", + "auth_tag": "KbqVv27nTc4qm7kzRWcjUQ==\n", "version": 3, "cipher": "aes-256-gcm" }, "postgresql_password": { - "encrypted_data": "Hu8yjpvf3/KY/K3gcbRbEce3OkjSrN91m2lCcePT+A==\n", - "iv": "+GFS35dpYy4zD2pi\n", - "auth_tag": "jCJQMskBFo9TSr8Uq7BWkw==\n", + "encrypted_data": "gPzUikJ3vBhjEzor0ie2341VPLRHNIvGvuD+HBwldw==\n", + "iv": "Jsnldm8Bx9IzXMNy\n", + "auth_tag": "63YXFGVxHn23X+/11qwTSA==\n", "version": 3, "cipher": "aes-256-gcm" }, "sentry_dsn": { - "encrypted_data": "KG8apiKfWa4gWwiz8tFLZywpp7gMp3hLDCREeR/RA6+i6Of7qYRx0YRzYdpE\n8gdaO0EOQZ4PXzVBsiIQy4ijHRt8udo2PNzzZP6h91jdAjw=\n", - "iv": "KWU6LeHdE3iwPyBU\n", - "auth_tag": "7pQO/t8pXiwrlb5xAas+Zg==\n", + "encrypted_data": "3aC1Nc+WiJIn+jc4HY4Rb1WAqCqEurbOLXhbah4zSIbVIaNGEKzaoC+IA+qi\nV1jAVxbE0A1w91MrGE6HNa+oMjiTMurYx7JzVBIpCm01rgo=\n", + "iv": "SxEbTBYY2Pa5BzAF\n", + "auth_tag": "zGkIpM/aeyuNm2F0I3VAcA==\n", "version": 3, "cipher": "aes-256-gcm" }, "rails_master_key": { - "encrypted_data": "E4OVlsZgm9wupyi9Xs7iEy11wJrCXL0Qrm9akulW7vmdrEfnI8KC6x1UooM+\nEI1fYmLs\n", - "iv": "YFRMYT8D+bF+iu5+\n", - "auth_tag": "wT7rorNWEKGNR7xQLTe/xg==\n", + "encrypted_data": "cWOeQYNzOjgDNi7ZpkMC/jN7nSPyODYRhA6EIhhihzPxkEDt+/4HGNAhLHGK\nlJiQeRD/\n", + "iv": "Svsvx9gsO9OQs9RV\n", + "auth_tag": "mXVNNo13F6FddhWnri1yHQ==\n", + "version": 3, + "cipher": "aes-256-gcm" + }, + "discourse_connect_secret": { + "encrypted_data": "BQcE5fUkiqJyuOR1dR9vNyxWzgWGX1Wl1WINJDGJ1sJiajrgAspPgDt0dX5L\nhxG8CQ==\n", + "iv": "UKpt0F1FODuosQ9u\n", + "auth_tag": "MLgv0jR9MhWGmQNUkA8GUQ==\n", "version": 3, "cipher": "aes-256-gcm" } diff --git a/environments/production.json b/environments/production.json index f0d6f1c..0d0d0ac 100644 --- a/environments/production.json +++ b/environments/production.json @@ -2,6 +2,9 @@ "name": "production", "override_attributes": { "akkounts": { + "discourse": { + "public_url": "https://community.kosmos.org" + }, "lndhub": { "public_url": "https://lndhub.kosmos.org", "public_key": "024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946" diff --git a/nodes/akkounts-1.json b/nodes/akkounts-1.json index 9f670b3..dc47bff 100644 --- a/nodes/akkounts-1.json +++ b/nodes/akkounts-1.json @@ -9,7 +9,7 @@ "automatic": { "fqdn": "akkounts-1", "os": "linux", - "os_version": "5.4.0-100-generic", + "os_version": "5.4.0-148-generic", "hostname": "akkounts-1", "ipaddress": "192.168.122.160", "roles": [ diff --git a/site-cookbooks/kosmos-akkounts/attributes/default.rb b/site-cookbooks/kosmos-akkounts/attributes/default.rb index b0997e9..44ea880 100644 --- a/site-cookbooks/kosmos-akkounts/attributes/default.rb +++ b/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 ' 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" diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb index c6ae288..689ad4c 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/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"] diff --git a/site-cookbooks/kosmos_discourse/templates/nginx_conf.erb b/site-cookbooks/kosmos_discourse/templates/nginx_conf.erb index 9db6621..db939fd 100644 --- a/site-cookbooks/kosmos_discourse/templates/nginx_conf.erb +++ b/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;