diff --git a/.gitignore b/.gitignore index f5ffa848..519af344 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ plans/ # Release tarballs stuff releases/ release.sh - diff --git a/rootfs/standard/usr/share/mynode/mynode_functions.sh b/rootfs/standard/usr/share/mynode/mynode_functions.sh index 042624a6..069032df 100644 --- a/rootfs/standard/usr/share/mynode/mynode_functions.sh +++ b/rootfs/standard/usr/share/mynode/mynode_functions.sh @@ -20,6 +20,10 @@ function settings_file_exists { return 1 } +function is_service_enabled { + systemctl is-enabled "$1" > /dev/null 2>&1 +} + function skip_base_upgrades { if [ -f /tmp/skip_base_upgrades ]; then return 0 diff --git a/rootfs/standard/usr/share/mynode_apps/canary/canary.json b/rootfs/standard/usr/share/mynode_apps/canary/canary.json index d3ce7853..03df1454 100644 --- a/rootfs/standard/usr/share/mynode_apps/canary/canary.json +++ b/rootfs/standard/usr/share/mynode_apps/canary/canary.json @@ -16,7 +16,7 @@ "Get instant notifications when your bitcoins move via ntfy push notifications.", "Features include: transaction monitoring, RBF/CPFP detection, balance alerts, and deep wallet scanning." ], - "latest_version": "v1.5.0", + "latest_version": "v1.5.2", "supported_archs": ["amd64", "arm64"], "download_skip": true, "requires_docker_image_installation": true, diff --git a/rootfs/standard/usr/share/mynode_apps/canary/scripts/install_canary.sh b/rootfs/standard/usr/share/mynode_apps/canary/scripts/install_canary.sh index 31776da7..10a0d986 100755 --- a/rootfs/standard/usr/share/mynode_apps/canary/scripts/install_canary.sh +++ b/rootfs/standard/usr/share/mynode_apps/canary/scripts/install_canary.sh @@ -9,8 +9,6 @@ set -e echo "==================== INSTALLING APP ====================" -VERSION="${VERSION:-v1.5.0}" - mkdir -p /opt/mynode/canary || true mkdir -p /mnt/hdd/mynode/canary || true diff --git a/rootfs/standard/usr/share/mynode_apps/canary/scripts/pre_canary.sh b/rootfs/standard/usr/share/mynode_apps/canary/scripts/pre_canary.sh index bcae1c46..ae8fe978 100755 --- a/rootfs/standard/usr/share/mynode_apps/canary/scripts/pre_canary.sh +++ b/rootfs/standard/usr/share/mynode_apps/canary/scripts/pre_canary.sh @@ -2,6 +2,8 @@ set -e +source /usr/share/mynode/mynode_functions.sh + DATA_DIR="/mnt/hdd/mynode/canary" ADMIN_PASSWORD_FILE="$DATA_DIR/admin_password" JWT_SECRET_FILE="$DATA_DIR/jwt_secret" @@ -30,5 +32,21 @@ CANARY_SELF_HOSTED_ADMIN_PASSWORD=$(cat "$ADMIN_PASSWORD_FILE") JWT_SECRET=$(cat "$JWT_SECRET_FILE") EOF +has_local_tx_explorer=0 + +if is_service_enabled mempool; then + echo "CANARY_MEMPOOL_PORT=4080" >> "$ENV_FILE" + has_local_tx_explorer=1 +fi + +if is_service_enabled btcrpcexplorer; then + echo "CANARY_BTC_RPC_EXPLORER_PORT=3002" >> "$ENV_FILE" + has_local_tx_explorer=1 +fi + +if [ "$has_local_tx_explorer" = "1" ]; then + echo "CANARY_TX_EXPLORER_PLATFORM=mynode" >> "$ENV_FILE" +fi + chown -R bitcoin:bitcoin "$DATA_DIR" chmod 600 "$ADMIN_PASSWORD_FILE" "$JWT_SECRET_FILE" "$ENV_FILE" diff --git a/rootfs/standard/usr/share/mynode_apps/canary/www/python/canary.py b/rootfs/standard/usr/share/mynode_apps/canary/www/python/canary.py index 52ab9005..d9d8b75a 100644 --- a/rootfs/standard/usr/share/mynode_apps/canary/www/python/canary.py +++ b/rootfs/standard/usr/share/mynode_apps/canary/www/python/canary.py @@ -31,7 +31,6 @@ def canary_page(): "app_status": app_status, "app_status_color": app_status_color, "app": app, - "canary_username": "admin@local", "canary_password": get_canary_password(), } return render_template("/app/canary/canary.html", **template_data) diff --git a/rootfs/standard/usr/share/mynode_apps/canary/www/templates/canary.html b/rootfs/standard/usr/share/mynode_apps/canary/www/templates/canary.html index 1725053f..190860e1 100644 --- a/rootfs/standard/usr/share/mynode_apps/canary/www/templates/canary.html +++ b/rootfs/standard/usr/share/mynode_apps/canary/www/templates/canary.html @@ -160,10 +160,6 @@
- - - -
Username{{canary_username}}
Password