diff --git a/CHANGES.md b/CHANGES.md index f8966680..c758abb2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ - Update: Raspberry Pi OS Base Image 64-bit (August 2020) - Update: bitcoin-core version 0.21.0-beta [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.21.0.md) - Update: LND version 0.12.1-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.12.1-beta) +- Update: Faraday 0.2.3-alpha https://github.com/lightninglabs/faraday/releases/tag/v0.2.3-alpha - New: Build SD card Image with parameters & FatPack [details](https://github.com/rootzoll/raspiblitz/pull/2044) ## Whats new in Version 1.6.3 of RaspiBlitz? diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh index 01f0f0d8..a48f2fb3 100755 --- a/home.admin/00settingsMenuServices.sh +++ b/home.admin/00settingsMenuServices.sh @@ -275,7 +275,8 @@ if [ "${faraday}" != "${choice}" ]; then sudo -u admin /home/admin/config.scripts/bonus.faraday.sh ${choice} source /mnt/hdd/raspiblitz.conf if [ "${faraday}" = "on" ]; then - sudo -u admin /home/admin/config.scripts/bonus.faraday.sh menu + #sudo -u admin /home/admin/config.scripts/bonus.faraday.sh menu + needsReboot=1 fi else echo "faraday setting unchanged." diff --git a/home.admin/config.scripts/bonus.faraday.sh b/home.admin/config.scripts/bonus.faraday.sh index cb191971..0bbd28f4 100755 --- a/home.admin/config.scripts/bonus.faraday.sh +++ b/home.admin/config.scripts/bonus.faraday.sh @@ -7,16 +7,9 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then exit 1 fi -echo "## bonus.faraday.sh" +version="0.2.3-alpha" +echo "## bonus.faraday.sh ${version}" -# determine version by running lnd version -lndOldVersion=$(lncli --version | grep -c "v0.10.") -#echo "# LND is old version: ${lndOldVersion}" -if [ ${lndOldVersion} -eq 0 ]; then - version="0.2.1-alpha" -else - version="0.1.0-alpha" -fi # version and trusted release signer PGPkeys="https://keybase.io/carlakirkcohen/pgp_keys.asc" PGPcheck="15E7ECF257098A4EF91655EB4CA7FE54A6213C91" @@ -232,13 +225,19 @@ WantedBy=multi-user.target sudo systemctl start faraday fi + echo "# default config path" + sudo mkdir /home/faraday/.faraday + sudo mkdir /home/faraday/.faraday/${chain}net + sudo chown -R faraday:faraday /home/faraday/.faraday + echo "# flag in raspiblitz config" if [ ${#faraday} -eq 0 ]; then echo "faraday='on'" >> /mnt/hdd/raspiblitz.conf fi sudo sed -i "s/^faraday=.*/faraday=on/g" /mnt/hdd/raspiblitz.conf - echo "# OK Faraday is installed" + echo "# OK Faraday is installed" + echo "# please 'restart' for clean creation of faraday tls/macaroons" exit 1 fi