From 6a677a6baacc98a89d99bf93cf9e7053dabfebd5 Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Wed, 8 Mar 2023 13:18:37 +0000
Subject: [PATCH] btcpay update v1.8.2, postgres database fix (#3697)

* btcpay update v1.8.0, postgres database fix

* btcpayserver update to v1.8.2
---
 CHANGES.md                                      |  2 +-
 home.admin/config.scripts/bonus.btcpayserver.sh | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1ad54304c..9ede4a8ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,7 +21,7 @@
 - Update: RTL v0.13.6 with update option [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.13.6)
 - Update: Thunderhub v0.13.16 with balance sharing disabled [details](https://github.com/apotdevin/thunderhub/releases/tag/v0.13.16)
 - Update: LNbits 0.9.6 [details](https://github.com/lnbits/lnbits-legend/releases/tag/0.9.6)
-- Update: BTCPayServer 1.7.5 (using postgres for new installs) [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.7.5)
+- Update: BTCPayServer 1.8.2 (using postgres for new installs) [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.8.2)
 - Update: ItchySats 0.7.0 [details](https://github.com/itchysats/itchysats/releases/tag/0.7.0)
 - Update: Channel Tools (chantools) v0.10.5 [details](https://github.com/guggero/chantools/releases/tag/v0.10.5)
 - Update: JoinMarket v0.9.9 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.9)
diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index 13772ce68..d28bbb26f 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -3,9 +3,9 @@
 # Based on: https://gist.github.com/normandmickey/3f10fc077d15345fb469034e3697d0d0
 
 # https://github.com/dgarage/NBXplorer/tags
-NBXplorerVersion="v2.3.59"
+NBXplorerVersion="v2.3.62"
 # https://github.com/btcpayserver/btcpayserver/releases
-BTCPayVersion="v1.7.5"
+BTCPayVersion="v1.8.2"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@@ -31,7 +31,7 @@ function NBXplorerConfig() {
     echo "# nbxplorermainnet database already exists"
   else
     echo "# Generate the database for nbxplorer"
-    sudo -u postgres psql -c "create database nbxplorermainnet;"
+    sudo -u postgres psql -c "CREATE DATABASE nbxplorermainnet TEMPLATE template0 LC_CTYPE 'C' LC_COLLATE 'C' ENCODING 'UTF8';"
     sudo -u postgres psql -c "create user nbxplorer with encrypted password 'raspiblitz';"
     sudo -u postgres psql -c "grant all privileges on database nbxplorermainnet to nbxplorer;"
   fi
@@ -68,7 +68,7 @@ function BtcPayConfig() {
       echo "# btcpaymainnet database already exists"
     else
       echo "# Generate the database for btcpay"
-      sudo -u postgres psql -c "create database btcpaymainnet;"
+      sudo -u postgres psql -c "CREATE DATABASE btcpaymainnet TEMPLATE template0 LC_CTYPE 'C' LC_COLLATE 'C' ENCODING 'UTF8';"
       sudo -u postgres psql -c "create user btcpay with encrypted password 'raspiblitz';"
       sudo -u postgres psql -c "grant all privileges on database btcpaymainnet to btcpay;"
     fi
@@ -696,6 +696,8 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
     echo "# deleting data"
     sudo -u postgres psql -c "drop database nbxplorermainnet;"
     sudo -u postgres psql -c "drop user nbxplorer;"
+    sudo -u postgres psql -c "drop database btcpaymainnet;"
+    sudo -u postgres psql -c "drop user btcpay;"
     sudo rm -R /mnt/hdd/app-data/.btcpayserver/
   else
     echo "# keeping data"