Merge pull request 'Config updates and improvements for new akkounts release' (#542) from chore/akkounts_updates into master

Reviewed-on: #542

data_bags/credentials/akkounts.json

@@ -1,37 +1,51 @@
 {
   "id": "akkounts",
   "postgresql_username": {
-    "encrypted_data": "W+Ia820+uYCAED9LRkQ1ZVe//56GRS5u0HrG\n",
-    "iv": "NpuVENC7C5FCjsEz\n",
-    "auth_tag": "KbqVv27nTc4qm7kzRWcjUQ==\n",
+    "encrypted_data": "/Idxzq83imf6o6pbmFAk7bgxg69N7/1KNhgj\n",
+    "iv": "34BrmVmlxzuA7IJG\n",
+    "auth_tag": "VyLpWDshrOd417ZiY3432w==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "postgresql_password": {
-    "encrypted_data": "gPzUikJ3vBhjEzor0ie2341VPLRHNIvGvuD+HBwldw==\n",
-    "iv": "Jsnldm8Bx9IzXMNy\n",
-    "auth_tag": "63YXFGVxHn23X+/11qwTSA==\n",
+    "encrypted_data": "XqEmt+yu7mB6vBOUCT/5AtIptdUamfniz+PrFYCP0A==\n",
+    "iv": "2XdVUHkeeS1LHzMx\n",
+    "auth_tag": "mq0v9ikHD7pxTUrGO+VF9A==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "sentry_dsn": {
-    "encrypted_data": "3aC1Nc+WiJIn+jc4HY4Rb1WAqCqEurbOLXhbah4zSIbVIaNGEKzaoC+IA+qi\nV1jAVxbE0A1w91MrGE6HNa+oMjiTMurYx7JzVBIpCm01rgo=\n",
-    "iv": "SxEbTBYY2Pa5BzAF\n",
-    "auth_tag": "zGkIpM/aeyuNm2F0I3VAcA==\n",
+    "encrypted_data": "u82JsPq5HvQRE2eWIbVp73LdqffyuTTylbURtM7XRJ6AXyKp1WD/iwVhNnL7\n/NKSWR24/u63WJCP4rXpW7293ZRU5UW/W3GwlOjNtbdxcaQ=\n",
+    "iv": "0GIV8v92dh4+Ma/Z\n",
+    "auth_tag": "XbuxPIZ5VxuMjw/f+usCgA==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "rails_master_key": {
-    "encrypted_data": "cWOeQYNzOjgDNi7ZpkMC/jN7nSPyODYRhA6EIhhihzPxkEDt+/4HGNAhLHGK\nlJiQeRD/\n",
-    "iv": "Svsvx9gsO9OQs9RV\n",
-    "auth_tag": "mXVNNo13F6FddhWnri1yHQ==\n",
+    "encrypted_data": "31N79um4TTD0tuDurrZVztoSv0sxZ70paV7AhD8P4+lX8kUkfhiugCbdhst0\n12YP5v/8\n",
+    "iv": "l4qanaerdou8AApw\n",
+    "auth_tag": "yvkcM4on1EMm1LhmmZ+O+g==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "discourse_connect_secret": {
-    "encrypted_data": "BQcE5fUkiqJyuOR1dR9vNyxWzgWGX1Wl1WINJDGJ1sJiajrgAspPgDt0dX5L\nhxG8CQ==\n",
-    "iv": "UKpt0F1FODuosQ9u\n",
-    "auth_tag": "MLgv0jR9MhWGmQNUkA8GUQ==\n",
+    "encrypted_data": "Ebs8KVEA0r4nFxYNjxxZFUWndxwoKes/9ihEgqgKLN76t6yzCUONeJZBMl0G\nXLdI8A==\n",
+    "iv": "ob8KBWeoHXFlZ7Nk\n",
+    "auth_tag": "motppQbVEhg6qyKRYpqctA==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "lndhub_admin_token": {
+    "encrypted_data": "I2hSF6X9L3OWbet5QWzrCyA3XyGFhFBgHh/uFr5dQ3RB\n",
+    "iv": "Kr8u2j5napFSamYc\n",
+    "auth_tag": "t93UNWomf+6WaZF7VVzTeQ==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "btcpay_auth_token": {
+    "encrypted_data": "0qesJ5KMvU2DlKdz7lExJWq0X9XYjpsqw61kLXWw4UNYwpNxPyFJSjbR9yKh\ntu0zMdtMB9Vur9izWBY=\n",
+    "iv": "gw2oAyeF2Kuvb3Em\n",
+    "auth_tag": "zMtos/E3e3XXeTlAY7o0lg==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   }

environments/production.json

@@ -2,6 +2,9 @@
   "name": "production",
   "override_attributes": {
     "akkounts": {
+      "btcpay": {
+        "store_id": "FNJVVsrVkKaduPDAkRVchdegjwzsNhpceAdonCaXAwBX"
+      },
       "ejabberd": {
         "admin_url": "https://xmpp.kosmos.org:5443/admin"
       },

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

@@ -11,6 +11,8 @@ node.default['akkounts']['smtp']['domain']          = 'kosmos.org'
 node.default['akkounts']['smtp']['auth_method']     = 'plain'
 node.default['akkounts']['smtp']['enable_starttls'] = 'auto'
 
+node.default['akkounts']['btcpay']['store_id'] = nil
+
 node.default['akkounts']['ejabberd']['admin_url'] = nil
 
 node.default['akkounts']['lndhub']['api_url'] = nil

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

@@ -20,6 +20,7 @@ user deploy_user do
 end
 
 package "libpq-dev"
+package "libvips"
 
 include_recipe 'redisio::default'
 include_recipe 'redisio::enable'
@@ -70,6 +71,8 @@ end
 
 if btcpay_host
   env[:btcpay_api_url] = "http://#{btcpay_host}:23001/api/v1"
+  env[:btcpay_store_id] = node['akkounts']['btcpay']['store_id']
+  env[:btcpay_auth_token] = credentials["btcpay_auth_token"]
 end
 
 env[:discourse_public_url] = "https://#{node['discourse']['domain']}"
@@ -104,6 +107,7 @@ if lndhub_host
   node.override["akkounts"]["lndhub"]["api_url"] = "http://#{lndhub_host}:3026"
   env[:lndhub_legacy_api_url] = node["akkounts"]["lndhub"]["api_url"]
   env[:lndhub_api_url] = node["akkounts"]["lndhub"]["api_url"]
+  env[:lndhub_admin_token] = credentials["lndhub_admin_token"]
   env[:lndhub_public_url] = node["akkounts"]["lndhub"]["public_url"]
   env[:lndhub_public_key] = node["akkounts"]["lndhub"]["public_key"]
   if postgres_readonly_host

site-cookbooks/kosmos-akkounts/templates/nginx_conf_akkounts_api.erb

@@ -18,7 +18,7 @@ server {
   access_log <%= node[:openresty][:log_dir] %>/<%= @domain %>.access.log json;
   error_log <%= node[:openresty][:log_dir] %>/<%= @domain %>.error.log warn;
 
-  location /kredits/ {
+  location / {
     add_header 'Access-Control-Allow-Origin' '*' always;
     add_header 'Access-Control-Allow-Methods' 'GET' always;
     add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
@@ -31,6 +31,6 @@ server {
     proxy_buffers 1024 8k;
     proxy_http_version 1.1;
 
-    proxy_pass http://_akkounts_api/api/kredits/;
+    proxy_pass http://_akkounts_api/api/;
   }
 }