Compare commits

..

22 Commits

Author SHA1 Message Date
rootzoll
be01bee97f #4893 explizit change locales 2024-12-19 16:19:50 +01:00
rootzoll
f38b3834ff #4893 make sure to create postgres with locale en_US.UTF-8 2024-12-19 14:47:41 +01:00
HODLmeTight
37851bf278 Enhance BBcloseAllChannels.sh to allow LND user selection for channel closing method (#4886)
Enhance BBcloseAllChannels.sh to allow user selection for channel closing method. Users can now choose between COOP for cooperative close and FORCE for forced close
2024-12-18 23:55:01 +01:00
/rootzoll
0edc9a778a Small Updates for v1.11.4 (#4889)
* AlbyHub 1.12.0
2024-12-18 23:19:24 +01:00
openoms
4039bf8f92 albyhub: fix typos, formatting, translate comment (#4885) 2024-12-18 23:01:08 +01:00
/rootzoll
4d3d45d31a v1.11.4rc1 (#4883) 2024-12-18 13:57:12 +01:00
/rootzoll
f5b229ef2b 4873 lnd update (#4879)
* #4873-update-lnd
* Added to CHANGES.md
* correct typos
2024-12-18 12:07:09 +01:00
/rootzoll
8900d2069a #4842 update cln to 24.11 (#4882) 2024-12-18 11:50:59 +01:00
/rootzoll
96ac514a9a 4876 lnbits (#4877)
* #4878 respect old LNBITS_ADMIN_UI setting
* #4876 lnbits option to switch ADMINUI
* #4876 add no new accounts option
* #4876 remove accounts option again
2024-12-18 11:39:36 +01:00
/rootzoll
7989b4c54d #4559 Improve blitz.release.sh (#4867)
* 4559 fsck on release
* fsck on release
* fsck after expand
* remove toc.sh
* #4861 force locale on release
2024-12-18 11:34:53 +01:00
/rootzoll
d0f97a4ccb #4727 Prepare bonus.albyhub.sh for WebUI (#4866)
adding needed funtions to albyhub installs script needed for API/WebUI integration
2024-12-18 11:32:08 +01:00
/rootzoll
bcd412f005 Merge pull request #4881 from raspiblitz/v1.11-albyhub
#4727 Add AlbyHub to RaspiBlitz SSH menus (#4848)
2024-12-18 10:53:47 +01:00
/rootzoll
ad0996f703 Fix #4834 Core Lightning Peercount (#4846) 2024-11-30 11:37:05 +01:00
/rootzoll
ef2a86d2aa #4727 Add AlbyHub to RaspiBlitz SSH menus (#4848)
* #4727 first draft for install script
* #4727 add x86
* #4727 recover & SSH menu
2024-11-21 16:41:42 +01:00
rootzoll
59157c2874 fixes #4829 2024-11-03 02:16:27 +01:00
rootzoll
c0418499e2 publipool - fix local ip 2024-11-03 01:24:37 +01:00
rootzoll
3da6db91d0 publicpool - clean up when install fails 2024-11-03 01:22:30 +01:00
/rootzoll
2ac7b19151 Fix #4817 BTCPay Server install (3) (#4826)
* #4817
2024-10-28 19:30:27 +01:00
/rootzoll
083c33317e Fix #4817 BTCPay Server install (2) (#4825)
* #4817 add fallback
2024-10-28 16:00:34 +01:00
/rootzoll
5bb31130b8 Fix #4817 BTCPay Server install (#4824) 2024-10-28 13:33:52 +01:00
openoms
e4adac1e67 fix lnd signing key, use guggero for old release, update roasbeef key (#4819) 2024-10-28 10:29:05 +01:00
/rootzoll
d24feeade5 Merge pull request #4809 from raspiblitz/dev
Release Candidate 1.11.3rc3
2024-10-17 21:57:38 +02:00
19 changed files with 137 additions and 143 deletions

View File

@@ -1,39 +1,18 @@
## What's new in Version 1.12.0 of RaspiBlitz?
Work In Progress
Features:
- Update: RaspberryOS arm64 base image 2024-11-19 (Debian 12 Bookworm) [details](https://downloads.raspberrypi.com/raspios_full_arm64/release_notes.txt)
- Update: amd64 base image: debian-12.8.0-amd64-netinst.iso [details](https://www.debian.org/releases/stable/amd64/release-notes/ch-whats-new.en.html)
- Update: Specter Desktop 2.0.5 [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.5)
- Update: Fulcrum Electrum server v1.11.1 (CLI install script with status menu) [details](https://github.com/cculianu/Fulcrum/releases/tag/v1.11.1)
## What's new in Version 1.11.4 of RaspiBlitz? ## What's new in Version 1.11.4 of RaspiBlitz?
ReleaseCandidate: https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.4rc1-2024-12-18.img.gz
Small AlbyHub feature release with security/bug-fixing relevant updates. Small AlbyHub feature release with security/bug-fixing relevant updates.
- New: AlbyHub v1.12.0 (SSH & WebUI) [details](https://github.com/getAlby) - New: AlbyHub v1.12.0 (SSH & WebUI) [details](https://github.com/getAlby)
- New: SSH-Option to turn on/off LNbits AdminUI [details](https://github.com/raspiblitz/raspiblitz/issues/4876) - New: SSH-Option to tirn on/off LNbits AdminUI [details](https://github.com/raspiblitz/raspiblitz/issues/4876)
- Update: LND v0.18.3-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.18.3-beta) - Update: LND v0.18.3-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.18.3-beta)
- Update: Core Lightning v24.11 [details](https://github.com/ElementsProject/lightning/releases/tag/v24.11) - Update: Core Lightning v24.11 [details](https://github.com/ElementsProject/lightning/releases/tag/v24.11)
Download RaspberryPi images:
- Minimal:
https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.4-2024-12-24.img.gz<br>
SHA-256-Checksum: 3d874e8e2518bb9db79df196d1dd7e6d567a0608a3df568cadef87a77b4d3841
- Fatpack:
https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.11.4-2024-12-24.img.gz<br>
SHA-256-Checksum: 31877d0085c20f34bf2bedeeec6bd4abc108595a4b0985d273ddaba2b0fbe654
## What's new in Version 1.11.3 of RaspiBlitz? ## What's new in Version 1.11.3 of RaspiBlitz?
Optimized now to run also on plain debian12 linux for Proxmox/VM & x86 systems. Optimized now to run also on plain debian12 linux for Proxmox/VM & x86 systems.
Containing Features:
- New: Publicpool - Open Source Solo Bitcoin Mining (SSH Menu) [details](https://www.youtube.com/watch?v=QbOsH04Z9xM) - New: Publicpool - Open Source Solo Bitcoin Mining (SSH Menu) [details](https://www.youtube.com/watch?v=QbOsH04Z9xM)
- New: Tailscale (SSH menu > SETTINGS) [details](https://en.wikipedia.org/wiki/Tailscale) - New: Tailscale (SSH menu > SETTINGS) [details](https://en.wikipedia.org/wiki/Tailscale)
- New: Telegraf Metrics for InfluxDB/Grafana (SSH menu > SETTINGS) [details](https://github.com/raspiblitz/raspiblitz/tree/dev/home.admin/assets/telegraf/README.md) - New: Telegraf Metrics for InfluxDB/Grafana (SSH menu > SETTINGS) [details](https://github.com/raspiblitz/raspiblitz/tree/dev/home.admin/assets/telegraf/README.md)
@@ -51,16 +30,6 @@ Containing Features:
- Update: CLBOSS 0.13.3 [details](https://github.com/ZmnSCPxj/clboss/releases/tag/v0.13.3) - Update: CLBOSS 0.13.3 [details](https://github.com/ZmnSCPxj/clboss/releases/tag/v0.13.3)
- Update: Electrum Server in Rust (electrs) v0.10.6 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0106-sep-29-2024) - Update: Electrum Server in Rust (electrs) v0.10.6 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0106-sep-29-2024)
Download RaspberryPi images:
- Minimal:
https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.3-2024-11-03.img.gz<br>
SHA-256-Checksum: 199fd4e671a49feb39420156031201c9118121d33ec6f9990fb9724de5be02c4
- Fatpack:
https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.11.3-2024-11-03.img.gz<br>
SHA-256-Checksum: 65e523562768b21dcda85b96003c559a665015889402a3cea27638e6c5e290bd
## What's new in Version 1.11.2 of RaspiBlitz? ## What's new in Version 1.11.2 of RaspiBlitz?
This is just a quick patch release for v1.11.1 This is just a quick patch release for v1.11.1

View File

@@ -1,6 +1,6 @@
# ![RaspiBlitz](pictures/raspilogo_tile_400px.png) # ![RaspiBlitz](pictures/raspilogo_tile_400px.png)
_Build your own Bitcoin & Lightning Fullnode on a RaspberryPi with an optional Display._ ([API](https://github.com/fusion44/blitz_api)|[WebUI](https://github.com/raspiblitz/raspiblitz-web)) _Build your own Bitcoin & Lightning Fullnode on a RaspberryPi with an optional Display._
![RaspiBlitz](pictures/raspiblitz.jpg) ![RaspiBlitz](pictures/raspiblitz.jpg)

View File

@@ -329,10 +329,8 @@ isDebianInHosts=$(grep -c "debian" /etc/hosts)
if [ ${isDebianInHosts} -eq 0 ]; then if [ ${isDebianInHosts} -eq 0 ]; then
echo "# Adding debian to /etc/hosts" echo "# Adding debian to /etc/hosts"
echo "127.0.1.1 debian" | tee -a /etc/hosts > /dev/null echo "127.0.1.1 debian" | tee -a /etc/hosts > /dev/null
if [ "${baseimage}" != "raspios_arm64" ]; then
systemctl restart networking systemctl restart networking
fi fi
fi
echo "*** Remove unnecessary packages ***" echo "*** Remove unnecessary packages ***"
unnecessary_packages=(libreoffice* oracle-java* chromium-browser nuscratch scratch sonic-pi plymouth python2 vlc* cups) unnecessary_packages=(libreoffice* oracle-java* chromium-browser nuscratch scratch sonic-pi plymouth python2 vlc* cups)

View File

@@ -1,5 +1,5 @@
variable "iso_name" { default = "debian-12.8.0-amd64-netinst.iso" } variable "iso_name" { default = "debian-12.7.0-amd64-netinst.iso" }
variable "iso_checksum" { default = "04396d12b0f377958a070c38a923c227832fa3b3e18ddc013936ecf492e9fbb3" } variable "iso_checksum" { default = "8fde79cfc6b20a696200fc5c15219cf6d721e8feb367e9e0e33a79d1cb68fa83" }
variable "pack" { default = "lean" } variable "pack" { default = "lean" }
variable "github_user" { default = "raspiblitz" } variable "github_user" { default = "raspiblitz" }
@@ -10,7 +10,7 @@ variable "boot" { default = "uefi" }
variable "preseed_file" { default = "preseed.cfg" } variable "preseed_file" { default = "preseed.cfg" }
variable "hostname" { default = "raspiblitz-amd64" } variable "hostname" { default = "raspiblitz-amd64" }
variable "disk_size" { default = "27000" } variable "disk_size" { default = "30000" }
variable "memory" { default = "4096" } variable "memory" { default = "4096" }
variable "cpus" { default = "4" } variable "cpus" { default = "4" }

View File

@@ -1,8 +1,8 @@
variable "pack" { default = "lean" } variable "pack" { default = "lean" }
variable "github_user" { default = "raspiblitz" } variable "github_user" { default = "raspiblitz" }
variable "branch" { default = "dev" } variable "branch" { default = "dev" }
variable "image_link" { default = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2024-11-19/2024-11-19-raspios-bookworm-arm64.img.xz" } variable "image_link" { default = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2024-03-15/2024-03-15-raspios-bookworm-arm64.img.xz" }
variable "image_checksum" { default = "ea6e68c48d14c3d78af5471c0b288bbf6522fdd775241f74d8295d106d344300" } variable "image_checksum" { default = "7e53a46aab92051d523d7283c080532bebb52ce86758629bf1951be9b4b0560f" }
variable "image_size" { default = "24G" } variable "image_size" { default = "24G" }
source "arm" "raspiblitz-arm64-rpi" { source "arm" "raspiblitz-arm64-rpi" {

View File

@@ -3,42 +3,111 @@
# load raspiblitz config data (with backup from old config) # load raspiblitz config data (with backup from old config)
source /home/admin/raspiblitz.info source /home/admin/raspiblitz.info
source /mnt/hdd/raspiblitz.conf source /mnt/hdd/raspiblitz.conf
if [ ${#network} -eq 0 ]; then network=`cat .network`; fi if [ ${#network} -eq 0 ]; then network=$(cat .network); fi
if [ ${#network} -eq 0 ]; then network="bitcoin"; fi if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
if [ ${#chain} -eq 0 ]; then if [ ${#chain} -eq 0 ]; then
chain=$(${network}-cli getblockchaininfo | jq -r '.chain') chain=$(${network}-cli getblockchaininfo | jq -r '.chain')
fi fi
source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
if [ $LNTYPE = cl ];then
# https://lightning.readthedocs.io/lightning-close.7.html
peerlist=$($lightningcli_alias listpeers|grep '"id":'|awk '{print $2}'|cut -d, -f1)
# to display
function cl_closeall_command {
for i in $peerlist; do
# close id [unilateraltimeout] [destination] [fee_negotiation_step] [*wrong_funding*]
echo "$lightningcli_alias close $i 30;"
done
}
command=$(cl_closeall_command)
# to run
function cl_closeall {
for i in $peerlist; do
# close id [unilateraltimeout] [destination] [fee_negotiation_step] [*wrong_funding*]
echo "# Attempting a mutual close one-by-one with a 30 seconds timeout"
$lightningcli_alias close $i 30
done
}
elif [ $LNTYPE = lnd ];then
# precheck: AutoPilot # precheck: AutoPilot
if [ "${autoPilot}" = "on" ]; then if [ "${autoPilot}" = "on" ]; then
dialog --title 'Info' --msgbox 'You need to turn OFF the LND AutoPilot first,\nso that closed channels are not opening up again.\nYou find the AutoPilot -----> SERVICES section' 7 55 dialog --title 'Info' --msgbox 'You need to turn OFF the LND AutoPilot first,\nso that closed channels are not opening up again.\nYou find the AutoPilot -----> SERVICES section' 7 55
exit 0
fi
# User choice for close type
close_type=$(dialog --clear \
--title "LND Channel Close Type" \
--menu "Choose how to close channels:" \
14 54 3 \
"COOP" "Attempt Cooperative Close" \
"FORCE" "Force Close Channels" \
2>&1 >/dev/tty)
# Set command based on user choice
if [ "$close_type" = "COOP" ]; then
command="$lncli_alias closeallchannels"
elif [ "$close_type" = "FORCE" ]; then
command="$lncli_alias closeallchannels --force"
else
echo "Invalid choice. Exiting."
exit 1 exit 1
fi fi
fi
command="lncli --chain=${network} --network=${chain}net closeallchannels --force"
clear clear
echo "***********************************" echo
echo "Closing All Channels (EXPERIMENTAL)" echo "# Precheck" # PRECHECK) check if chain is in sync
echo "***********************************" if [ $LNTYPE = cl ];then
echo "" BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1)
echo "COMMAND LINE: " CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight)
echo $command if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
echo "" chainOutSync=0
echo "RESULT:" else
chainOutSync=1
# PRECHECK) check if chain is in sync
chainInSync=$(lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c)
if [ ${chainInSync} -eq 0 ]; then
command=""
result="FAIL PRECHECK - lncli getinfo shows 'synced_to_chain': false - wait until chain is sync "
fi fi
elif [ $LNTYPE = lnd ];then
chainOutSync=$($lncli_alias getinfo | grep '"synced_to_chain": false' -c)
fi
if [ ${chainOutSync} -eq 1 ]; then
if [ $LNTYPE = cl ];then
echo "# FAIL PRECHECK - '${netprefix}lightning-cli getinfo' blockheight is different from '${netprefix}bitcoind getblockchaininfo' - wait until chain is sync "
elif [ $LNTYPE = lnd ];then
echo "# FAIL PRECHECK - ${netprefix}lncli getinfo shows 'synced_to_chain': false - wait until chain is sync "
fi
echo
echo "# PRESS ENTER to return to menu"
read key
exit 0
else
echo "# OK - the chain is synced"
fi
# raise high focus on lightning channels next 1 hour
/home/admin/_cache.sh focus ln_${LNTYPE}_${CHAIN}_channels_active 0 3600
/home/admin/_cache.sh focus ln_${LNTYPE}_${CHAIN}_channels_inactive 0 3600
/home/admin/_cache.sh focus ln_${LNTYPE}_${CHAIN}_channels_total 0 3600
echo "#####################################"
echo "# Closing All Channels (EXPERIMENTAL)"
echo "#####################################"
echo
echo "# COMMAND LINE: "
echo $command
echo
echo "# RESULT:"
# execute command # execute command
if [ ${#command} -gt 0 ]; then if [ ${#command} -gt 0 ]; then
if [ $LNTYPE = cl ];then
cl_closeall
elif [ $LNTYPE = lnd ];then
${command} ${command}
fi fi
fi
echo "" echo
echo "OK - please recheck if channels really closed" echo "# OK - please recheck if channels really closed"
sleep 5 sleep 5

View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# https://github.com/cculianu/Fulcrum/releases # https://github.com/cculianu/Fulcrum/releases
fulcrumVersion="1.11.1" fulcrumVersion="1.10.0"
portTCP="50021" portTCP="50021"
portSSL="50022" portSSL="50022"

View File

@@ -234,16 +234,6 @@ Consider adding a IP2TOR Bridge under OPTIONS."
OPTIONS+=(ADMINUI "Deactivate 'Admin UI'") OPTIONS+=(ADMINUI "Deactivate 'Admin UI'")
fi fi
# Allow New Accounts (only if AdminUI is OFF)
allowNewAccountsFalse=$(sudo grep -c "LNBITS_ALLOW_NEW_ACCOUNTS=false" $lnbitsConfig)
if [ ${activatedAdminUI} -eq 0 ]; then
if [ ${allowNewAccountsFalse} -eq 0 ]; then
OPTIONS+=(NEWACCOUNTS "Disable New Accounts")
else
OPTIONS+=(NEWACCOUNTS "Enable New Accounts")
fi
fi
WIDTH=66 WIDTH=66
CHOICE_HEIGHT=$(("${#OPTIONS[@]}/2+1")) CHOICE_HEIGHT=$(("${#OPTIONS[@]}/2+1"))
HEIGHT=$((CHOICE_HEIGHT + 7)) HEIGHT=$((CHOICE_HEIGHT + 7))
@@ -316,27 +306,7 @@ Consider adding a IP2TOR Bridge under OPTIONS."
sudo sed -i "/^LNBITS_ADMIN_UI=/d" $lnbitsConfig sudo sed -i "/^LNBITS_ADMIN_UI=/d" $lnbitsConfig
sudo bash -c "echo 'LNBITS_ADMIN_UI=false' >> ${lnbitsConfig}" sudo bash -c "echo 'LNBITS_ADMIN_UI=false' >> ${lnbitsConfig}"
fi fi
echo "Restarting LNbits to activate new setting ..." echo "Restarting LNbits ..."
sudo systemctl restart lnbits
echo "PRESS ENTER to continue"
read key
exit 0
;;
NEWACCOUNTS)
clear
echo
if [ ${allowNewAccountsFalse} -eq 0 ]; then
echo "Disable New Accounts"
sudo sed -i "/^LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
sudo sed -i "/^# LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
sudo bash -c "echo 'LNBITS_ALLOW_NEW_ACCOUNTS=false' >> ${lnbitsConfig}"
else
echo "Enable New Accounts"
sudo sed -i "/^LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
sudo sed -i "/^# LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
sudo bash -c "echo 'LNBITS_ALLOW_NEW_ACCOUNTS=true' >> ${lnbitsConfig}"
fi
echo "Restarting LNbits to activate new setting ..."
sudo systemctl restart lnbits sudo systemctl restart lnbits
echo "PRESS ENTER to continue" echo "PRESS ENTER to continue"
read key read key

View File

@@ -202,20 +202,11 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
if [ "${isInstalled}" == "0" ]; then if [ "${isInstalled}" == "0" ]; then
echo "# Install code base first ...." echo "# Install code base first ...."
if ! /home/admin/config.scripts/bonus.mempool.sh install; then if ! /home/admin/config.scripts/bonus.mempool.sh install; then
/home/admin/config.scripts/bonus.mempool.sh uninstall 2>/dev/null
echo "FAIL - install did not run correctly, aborting" echo "FAIL - install did not run correctly, aborting"
exit 1 exit 1
fi fi
fi fi
# check if /home/mempool/mempool exists
if [ ! -d "/home/mempool/mempool" ]; then
/home/admin/config.scripts/bonus.mempool.sh uninstall 2>/dev/null
echo "error='mempool code base install failed'"
echo "# please run manually first: /home/admin/config.scripts/bonus.mempool.sh install"
exit 1
fi
echo "# *** Activate MEMPOOL ***" echo "# *** Activate MEMPOOL ***"
# make sure mariadb is running # make sure mariadb is running
@@ -242,7 +233,6 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
RPC_USER=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcuser | cut -c 9-) RPC_USER=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcuser | cut -c 9-)
PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-) PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
sudo rm /var/cache/raspiblitz/mempool-config.json 2>/dev/null
touch /var/cache/raspiblitz/mempool-config.json touch /var/cache/raspiblitz/mempool-config.json
chmod 600 /var/cache/raspiblitz/mempool-config.json || exit 1 chmod 600 /var/cache/raspiblitz/mempool-config.json || exit 1
cat >/var/cache/raspiblitz/mempool-config.json <<EOF cat >/var/cache/raspiblitz/mempool-config.json <<EOF

View File

@@ -35,12 +35,6 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
sudo apt install -y postgresql-$PG_VERSION sudo apt install -y postgresql-$PG_VERSION
fi fi
# make sure en_GB locale is available for now - see #4893
echo "# temp fixing locale"
sudo sed -i '/^#en_GB.UTF-8 UTF-8/s/^#//' /etc/locale.gen
sudo sed -i '/^# en_GB.UTF-8 UTF-8/s/^# //' /etc/locale.gen
sudo locale-gen
postgres_datadir="/var/lib/postgresql" # default data dir postgres_datadir="/var/lib/postgresql" # default data dir
postgres_confdir="/etc/postgresql" # default conf dir postgres_confdir="/etc/postgresql" # default conf dir
@@ -68,7 +62,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
sudo chown -R postgres:postgres $postgres_datadir sudo chown -R postgres:postgres $postgres_datadir
echo "# Create cluster" echo "# Create cluster"
sudo pg_createcluster $PG_VERSION main sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
sudo pg_ctlcluster $PG_VERSION main start sudo pg_ctlcluster $PG_VERSION main start
elif [ -d /mnt/hdd/app-data/postgresql/$PG_VERSION/main ]; then elif [ -d /mnt/hdd/app-data/postgresql/$PG_VERSION/main ]; then
@@ -85,12 +79,12 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
echo "# Create $PG_VERSION config" echo "# Create $PG_VERSION config"
sudo mkdir -p $postgres_datadir/$PG_VERSION/main sudo mkdir -p $postgres_datadir/$PG_VERSION/main
sudo chown -R postgres:postgres $postgres_datadir sudo chown -R postgres:postgres $postgres_datadir
sudo pg_createcluster $PG_VERSION main sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
sudo pg_ctlcluster $PG_VERSION main start sudo pg_ctlcluster $PG_VERSION main start
echo "Setting default password for postgres user" echo "Setting default password for postgres user"
# start cluster temporarily # start cluster temporarily
sudo systemctl start postgresql sudo systemctl start postgresql
sudo pg_createcluster $PG_VERSION main sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
sudo pg_ctlcluster $PG_VERSION main start sudo pg_ctlcluster $PG_VERSION main start
echo "Setting default password for postgres user" echo "Setting default password for postgres user"
sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres';" sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres';"
@@ -114,7 +108,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
sudo chown -R postgres:postgres $postgres_datadir sudo chown -R postgres:postgres $postgres_datadir
sudo systemctl start postgresql sudo systemctl start postgresql
sudo systemctl start postgresql@13-main sudo systemctl start postgresql@13-main
sudo pg_createcluster $PG_VERSION main sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
sudo pg_ctlcluster $PG_VERSION main start sudo pg_ctlcluster $PG_VERSION main start
elif [ -d /mnt/hdd/app-data/postgresql/13/main ]; then elif [ -d /mnt/hdd/app-data/postgresql/13/main ]; then
@@ -136,7 +130,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
sudo chown -R postgres:postgres $postgres_datadir sudo chown -R postgres:postgres $postgres_datadir
# start cluster temporarily # start cluster temporarily
sudo systemctl start postgresql sudo systemctl start postgresql
sudo pg_createcluster 13 main sudo pg_createcluster --locale en_US.UTF-8 13 main
sudo pg_ctlcluster 13 main start sudo pg_ctlcluster 13 main start
echo "# Setting default password for postgres user" echo "# Setting default password for postgres user"
sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres';" sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres';"
@@ -160,7 +154,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
sudo chown -R postgres:postgres $postgres_datadir sudo chown -R postgres:postgres $postgres_datadir
sudo systemctl start postgresql sudo systemctl start postgresql
sudo systemctl start postgresql@13-main sudo systemctl start postgresql@13-main
sudo pg_createcluster 13 main sudo pg_createcluster --locale en_US.UTF-8 13 main
sudo pg_ctlcluster 13 main start sudo pg_ctlcluster 13 main start
if [ -d /mnt/hdd/app-data/postgresql/$PG_VERSION ] || pg_lsclusters | grep -q "$PG_VERSION main"; then if [ -d /mnt/hdd/app-data/postgresql/$PG_VERSION ] || pg_lsclusters | grep -q "$PG_VERSION main"; then
@@ -191,6 +185,24 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
fi fi
fi fi
# Setting PostgreSQL locale settings
LOCALE_SETTINGS=(
"lc_messages = 'en_US.UTF-8'"
"lc_monetary = 'en_US.UTF-8'"
"lc_numeric = 'en_US.UTF-8'"
"lc_time = 'en_US.UTF-8'"
)
for setting in "${LOCALE_SETTINGS[@]}"; do
key=$(echo "$setting" | cut -d= -f1 | tr -d ' ')
if ! sudo grep -q "^${key}" /etc/postgresql/$PG_VERSION/main/postgresql.conf; then
echo "# Adding $setting"
echo "$setting" | sudo tee -a /etc/postgresql/$PG_VERSION/main/postgresql.conf
else
echo "# Updating $setting"
sudo sed -i "s|^${key}.*|${setting}|" /etc/postgresql/$PG_VERSION/main/postgresql.conf
fi
done
# start cluster # start cluster
sudo systemctl enable postgresql sudo systemctl enable postgresql
sudo systemctl start postgresql sudo systemctl start postgresql

View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# https://github.com/cryptoadvance/specter-desktop # https://github.com/cryptoadvance/specter-desktop
pinnedVersion="2.0.5" pinnedVersion="2.0.4"
# command info # command info
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then

View File

@@ -60,14 +60,16 @@ ExecStartPost=-/home/admin/config.scripts/cl.check.sh poststart $CHAIN
# Creates /run/lightningd owned by bitcoin # Creates /run/lightningd owned by bitcoin
RuntimeDirectory=lightningd RuntimeDirectory=lightningd
User=bitcoin User=bitcoin
Group=bitcoin Group=bitcoin
# Type=forking hangs on restart # Type=forking hangs on restart
Type=simple Type=simple
PIDFile=/run/lightningd/${netprefix}lightningd.pid PIDFile=/run/lightningd/${netprefix}lightningd.pid
Restart=always Restart=on-failure
RestartSec=60
TimeoutSec=240 TimeoutSec=240
RestartSec=30
StandardOutput=null StandardOutput=null
StandardError=journal StandardError=journal

View File

@@ -162,7 +162,7 @@ if [ "$1" = "install" ]; then
exit 1 exit 1
fi fi
echo echo
echo "- OK the installation of Core Lightning ${installed} is successful" echo "- OK the installation of Core Lightning v${installed} is successful"
exit 0 exit 0
fi fi

View File

@@ -259,19 +259,6 @@ if [ "$2" = "wallet" ]; then
exit 1 exit 1
fi fi
ln_pendingbalance=$($lndcli_alias pendingchannels 2>/dev/null)
if [ "${ln_pendingbalance}" == "" ]; then
echo "error='no data'"
exit 1
fi
ln_pendingonchainbalance_sum=$(echo "${ln_pendingbalance}" | jq -r '
([ .pending_force_closing_channels[].channel.local_balance,
.pending_closing_channels[].channel.local_balance
] | map(tonumber) | add // 0)')
lnd_wallet_onchain_pending=$(( ${lnd_wallet_onchain_pending:-0} + ${ln_pendingonchainbalance_sum:-0} ))
# parse data # parse data
lnd_wallet_channels_balance=$(echo "$ln_channelbalance" | jq -r '.balance') lnd_wallet_channels_balance=$(echo "$ln_channelbalance" | jq -r '.balance')
lnd_wallet_channels_pending=$(echo "$ln_channelbalance" | jq -r '.pending_open_balance') lnd_wallet_channels_pending=$(echo "$ln_channelbalance" | jq -r '.pending_open_balance')

View File

@@ -167,9 +167,6 @@ EOF
# setting value in raspi blitz config # setting value in raspi blitz config
/home/admin/config.scripts/blitz.conf.sh set runBehindTor "off" /home/admin/config.scripts/blitz.conf.sh set runBehindTor "off"
# remove "debug=tor" from bitcoin.conf
sudo sed -i '/^debug=tor$/d' /mnt/hdd/bitcoin/bitcoin.conf
# deactivate bitcoin over tor (function call) # deactivate bitcoin over tor (function call)
deactivateBitcoinOverTor deactivateBitcoinOverTor
echo echo