Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ plans/
# Release tarballs stuff
releases/
release.sh

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.8"

services:
backend:
image: canary-backend:latest
image: schjonhaug/canary-backend:v1.5.2
network_mode: host
restart: unless-stopped
stop_grace_period: 30s
Expand All @@ -18,7 +18,7 @@ services:
CANARY_BIND_ADDRESS: 127.0.0.1:3004

frontend:
image: canary-frontend:latest
image: schjonhaug/canary-frontend:v1.5.2
network_mode: host
restart: unless-stopped
stop_grace_period: 30s
Expand Down
2 changes: 1 addition & 1 deletion rootfs/standard/usr/share/mynode_apps/canary/canary.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e

echo "==================== INSTALLING APP ===================="

VERSION="${VERSION:-v1.5.0}"
VERSION="${VERSION:-v1.5.2}"

mkdir -p /opt/mynode/canary || true
mkdir -p /mnt/hdd/mynode/canary || true
Expand Down
31 changes: 31 additions & 0 deletions rootfs/standard/usr/share/mynode_apps/canary/scripts/pre_canary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,21 @@ generate_secret() {
tr -dc A-Za-z0-9 < /dev/urandom | head -c "$length"
}

service_is_enabled() {
local service_name="$1"
systemctl is-enabled "$service_name" > /dev/null 2>&1
}

service_is_active() {
local service_name="$1"
systemctl is-active "$service_name" > /dev/null 2>&1
}

service_is_available() {
local service_name="$1"
service_is_enabled "$service_name" && service_is_active "$service_name"
}

cp -f app_data/docker-compose.yml docker-compose.yml

# Ensure data directory exists before starting.
Expand All @@ -30,5 +45,21 @@ CANARY_SELF_HOSTED_ADMIN_PASSWORD=$(cat "$ADMIN_PASSWORD_FILE")
JWT_SECRET=$(cat "$JWT_SECRET_FILE")
EOF

has_local_tx_explorer=0

if service_is_available mempool; then
echo "CANARY_MEMPOOL_PORT=4080" >> "$ENV_FILE"
has_local_tx_explorer=1
fi

if service_is_available 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"
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,6 @@
</div>
<div class="app_page_block_contents_text">
<table class="info_table" style="font-size: 12px; margin-left: 10px">
<tr>
<th>Username</th>
<td><span class="canary_credentials_value">{{canary_username}}</span></td>
</tr>
<tr>
<th>Password</th>
<td>
Expand Down