From 425735ac05ed2c395697f26188eb3eff5fc7f957 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Mon, 6 Jul 2020 17:36:41 +0200 Subject: [PATCH 1/5] Kindle Display: Add kindleDisplay=on on install In case the value `kindleDisplay=` isn't in the raspiblitz.conf it didn't get added. Now that works. --- home.admin/config.scripts/bonus.kindle-display.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home.admin/config.scripts/bonus.kindle-display.sh b/home.admin/config.scripts/bonus.kindle-display.sh index 2bf34ba0d..088cb6b93 100755 --- a/home.admin/config.scripts/bonus.kindle-display.sh +++ b/home.admin/config.scripts/bonus.kindle-display.sh @@ -7,6 +7,7 @@ SERVER_PORT=3030 APP_DATA_DIR=/mnt/hdd/app-data/kindle-display HOME_DIR=/home/$USERNAME CONFIG_FILE=$APP_DATA_DIR/.env +RASPIBLITZ_FILE=/mnt/hdd/raspiblitz.conf APP_ROOT_DIR=$HOME_DIR/kindle-display APP_SERVER_DIR=$APP_ROOT_DIR/server CRON_FILE=$APP_SERVER_DIR/cron.sh @@ -114,7 +115,7 @@ EOF echo "Switch to the '$USERNAME' user and adapt the settings in $CONFIG_FILE" # setting value in raspi blitz config - sudo sed -i "s/^kindleDisplay=.*/kindleDisplay=on/g" /mnt/hdd/raspiblitz.conf + grep -q '^kindleDisplay' $RASPIBLITZ_FILE && sudo sed -i "s/^kindleDisplay=.*/kindleDisplay=on/g" $RASPIBLITZ_FILE || echo 'kindleDisplay=on' >> $RASPIBLITZ_FILE else echo "KINDLE-DISPLAY already installed." fi @@ -129,7 +130,7 @@ EOF echo "" echo "SHELL=/bin/bash" echo "PATH=/bin:/usr/bin:/usr/local/bin" - echo "*/5 * * * * $CRON_FILE 2>&1 > /dev/null" + echo "*/5 * * * * $CRON_FILE > /dev/null 2>&1" fi exit 0 @@ -144,7 +145,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then echo "*** REMOVING KINDLE-DISPLAY ***" # setting value in raspi blitz config - sudo sed -i "s/^kindleDisplay=.*/kindleDisplay=off/g" /mnt/hdd/raspiblitz.conf + sudo sed -i "s/^kindleDisplay=.*/kindleDisplay=off/g" $RASPIBLITZ_FILE # uninstall service sudo systemctl stop kindle-display From 4317aa35a750f2b385a4d816cb5bf16ed65fed71 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 7 Jul 2020 12:09:52 +0200 Subject: [PATCH 2/5] Kindle Display: Use app version 0.2.4 --- home.admin/config.scripts/bonus.kindle-display.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/config.scripts/bonus.kindle-display.sh b/home.admin/config.scripts/bonus.kindle-display.sh index 088cb6b93..03a151772 100755 --- a/home.admin/config.scripts/bonus.kindle-display.sh +++ b/home.admin/config.scripts/bonus.kindle-display.sh @@ -11,7 +11,7 @@ RASPIBLITZ_FILE=/mnt/hdd/raspiblitz.conf APP_ROOT_DIR=$HOME_DIR/kindle-display APP_SERVER_DIR=$APP_ROOT_DIR/server CRON_FILE=$APP_SERVER_DIR/cron.sh -APP_VERSION=0.2.3 +APP_VERSION=0.2.4 # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then From 56ec96194162a37018d5630796f7a12752348134 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 8 Jul 2020 13:38:56 +0200 Subject: [PATCH 3/5] Kindle Display: Update with opt-in fallbacks --- home.admin/config.scripts/bonus.kindle-display.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/home.admin/config.scripts/bonus.kindle-display.sh b/home.admin/config.scripts/bonus.kindle-display.sh index 03a151772..657bf03c8 100755 --- a/home.admin/config.scripts/bonus.kindle-display.sh +++ b/home.admin/config.scripts/bonus.kindle-display.sh @@ -11,7 +11,7 @@ RASPIBLITZ_FILE=/mnt/hdd/raspiblitz.conf APP_ROOT_DIR=$HOME_DIR/kindle-display APP_SERVER_DIR=$APP_ROOT_DIR/server CRON_FILE=$APP_SERVER_DIR/cron.sh -APP_VERSION=0.2.4 +APP_VERSION=0.3.0 # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then @@ -60,12 +60,21 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then cat > $configFile < Access Tokens > Legacy API Keys +# Omit these setting to use Kraken as a fallback. # BTCPAY_HOST="https://my.btcpayserver.com" # BTCPAY_API_TOKEN="myBtcPayLegacyApiKey" + +# Shall the fallbacks be used? +DISPLAY_FALLBACK_BLOCK=false +DISPLAY_FALLBACK_RATES=true EOF sudo mv $configFile $CONFIG_FILE fi From a13f83681193c8dbfd0559d762447bd5ebcfa824 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 8 Jul 2020 13:55:59 +0200 Subject: [PATCH 4/5] Kindle Display: Add jq dependency --- home.admin/config.scripts/bonus.kindle-display.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/config.scripts/bonus.kindle-display.sh b/home.admin/config.scripts/bonus.kindle-display.sh index 657bf03c8..f47a55092 100755 --- a/home.admin/config.scripts/bonus.kindle-display.sh +++ b/home.admin/config.scripts/bonus.kindle-display.sh @@ -29,7 +29,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then isInstalled=$(sudo ls $HOME_DIR 2>/dev/null | grep -c 'kindle-display') if [ ${isInstalled} -eq 0 ]; then # install dependencies - sudo apt install -y firefox-esr pngcrush jo + sudo apt install -y firefox-esr pngcrush jo jq # install nodeJS /home/admin/config.scripts/bonus.nodejs.sh on From 85d8451e7fb61d8cd0ca9bff9177eea5761dede8 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Fri, 10 Jul 2020 10:04:48 +0200 Subject: [PATCH 5/5] Kindle Display: Use app version 0.4.0 and update config --- home.admin/config.scripts/bonus.kindle-display.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/home.admin/config.scripts/bonus.kindle-display.sh b/home.admin/config.scripts/bonus.kindle-display.sh index f47a55092..ea59ef169 100755 --- a/home.admin/config.scripts/bonus.kindle-display.sh +++ b/home.admin/config.scripts/bonus.kindle-display.sh @@ -11,7 +11,7 @@ RASPIBLITZ_FILE=/mnt/hdd/raspiblitz.conf APP_ROOT_DIR=$HOME_DIR/kindle-display APP_SERVER_DIR=$APP_ROOT_DIR/server CRON_FILE=$APP_SERVER_DIR/cron.sh -APP_VERSION=0.3.0 +APP_VERSION=0.4.0 # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then @@ -61,11 +61,19 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then # Server port DISPLAY_SERVER_PORT=$SERVER_PORT +# Require Tor for outside API calls +DISPLAY_FORCE_TOR=true + # Bitcoin RPC credentials for getting the blockcount. # Omit these setting to use blockchain.info as a fallback. DISPLAY_BITCOIN_RPC_USER="$RPC_USER" DISPLAY_BITCOIN_RPC_PASS="$RPC_PASS" +# Exchange rates to show. +# Use identifiers supported by BTCPay/Kraken, e.g. EUR, CHF +DISPLAY_RATE1="USD" +DISPLAY_RATE2="EUR" + # BTCPay Settings for rate fetching. # Generate API via Store > Access Tokens > Legacy API Keys # Omit these setting to use Kraken as a fallback.