diff --git a/environments/production.json b/environments/production.json index 72e7ef2..ea28097 100644 --- a/environments/production.json +++ b/environments/production.json @@ -3,7 +3,8 @@ "override_attributes": { "akkounts": { "lndhub": { - "public_url": "https://lndhub.kosmos.org" + "public_url": "https://lndhub.kosmos.org", + "public_key": "024cd3be18617f39cf645851e3ba63f51fc13f0bb09e3bb25e6fd4de556486d946" } }, "garage": { diff --git a/nodes/akkounts-1.json b/nodes/akkounts-1.json index 174a57a..1922a96 100644 --- a/nodes/akkounts-1.json +++ b/nodes/akkounts-1.json @@ -27,7 +27,6 @@ "kosmos_postgresql::hostsfile", "kosmos-akkounts", "kosmos-akkounts::default", - "kosmos-akkounts::nginx", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -54,19 +53,8 @@ "nodejs::repo", "nodejs::npm", "nodejs::install", - "kosmos-nginx::default", - "nginx::default", - "nginx::package", - "nginx::ohai_plugin", - "nginx::repo", - "nginx::commons", - "nginx::commons_dir", - "nginx::commons_script", - "nginx::commons_conf", - "kosmos-nginx::firewall", "git::default", - "git::package", - "kosmos-base::letsencrypt" + "git::package" ], "platform": "ubuntu", "platform_version": "20.04", diff --git a/site-cookbooks/kosmos-akkounts/attributes/default.rb b/site-cookbooks/kosmos-akkounts/attributes/default.rb index 8b2ad05..64fde27 100644 --- a/site-cookbooks/kosmos-akkounts/attributes/default.rb +++ b/site-cookbooks/kosmos-akkounts/attributes/default.rb @@ -7,6 +7,7 @@ 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.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 4585e4c..8b4da48 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb @@ -49,6 +49,7 @@ if lndhub_host env[:lndhub_legacy_api_url] = node["akkounts"]["lndhub"]["api_url"] env[:lndhub_api_url] = node["akkounts"]["lndhub"]["api_url"] env[:lndhub_public_url] = node["akkounts"]["lndhub"]["public_url"] + env[:lndhub_public_key] = node["akkounts"]["lndhub"]["public_key"] if postgres_readonly_host env[:lndhub_admin_ui] = true env[:lndhub_pg_host] = postgres_readonly_host