saavagebueno/ProxmoxVED
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVED.git synced 2026-03-31 06:24:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(ente,garmin-grafana): resolve port conflict and credential piping

Browse Source 
Ente: Remove circular Caddy :8080 reverse_proxy block that conflicted
with Museum binding to the same port. Museum serves directly on 8080.

Garmin-Grafana: Use GARMINCONNECT_EMAIL and GARMINCONNECT_BASE64_PASSWORD
env vars instead of broken heredoc stdin piping through timeout+uv run.
MFA code piped via stdin only when provided.
This commit is contained in:
CanbiZ (MickLesk)
2026-03-27 14:54:58 +01:00
parent 61d73907ec
commit 3540b0ae90
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
install/ente-install.sh
View File

@@ -289,16 +289,6 @@ cat <<EOF >/etc/caddy/Caddyfile
} }
} }
# Museum API Proxy
:8080 {
reverse_proxy localhost:8080
header {
Access-Control-Allow-Origin *
Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
Access-Control-Allow-Headers *
}
}
EOF EOF
systemctl reload caddy systemctl reload caddy
msg_ok "Configured Caddy" msg_ok "Configured Caddy"

15
install/garmin-grafana-install.sh
View File

@@ -102,13 +102,16 @@ if [[ -z "$(ls -A /opt/garmin-grafana/.garminconnect)" ]]; then
read -r -p "Please enter your Garmin Connect Email: " GARMIN_EMAIL read -r -p "Please enter your Garmin Connect Email: " GARMIN_EMAIL
read -r -p "Please enter your Garmin Connect Password (used to generate token, NOT stored): " GARMIN_PASSWORD read -r -p "Please enter your Garmin Connect Password (used to generate token, NOT stored): " GARMIN_PASSWORD
read -r -p "Please enter your MFA Code (leave blank if not applicable): " GARMIN_MFA read -r -p "Please enter your MFA Code (leave blank if not applicable): " GARMIN_MFA
GARMIN_BASE64_PASSWORD=$(echo -n "${GARMIN_PASSWORD}" | base64 -w0)
msg_info "Creating Garmin credentials (timeout 60s)" msg_info "Creating Garmin credentials (timeout 60s)"
timeout 60s uv run --env-file /opt/garmin-grafana/.env --project /opt/garmin-grafana/ /opt/garmin-grafana/src/garmin_grafana/garmin_fetch.py <<EOF if [[ -n "${GARMIN_MFA}" ]]; then
${GARMIN_EMAIL} echo "${GARMIN_MFA}" | GARMINCONNECT_EMAIL="${GARMIN_EMAIL}" GARMINCONNECT_BASE64_PASSWORD="${GARMIN_BASE64_PASSWORD}" \
${GARMIN_PASSWORD} timeout 60s uv run --env-file /opt/garmin-grafana/.env --project /opt/garmin-grafana/ /opt/garmin-grafana/src/garmin_grafana/garmin_fetch.py
${GARMIN_MFA} else
EOF GARMINCONNECT_EMAIL="${GARMIN_EMAIL}" GARMINCONNECT_BASE64_PASSWORD="${GARMIN_BASE64_PASSWORD}" \
unset GARMIN_EMAIL GARMIN_PASSWORD GARMIN_MFA timeout 60s uv run --env-file /opt/garmin-grafana/.env --project /opt/garmin-grafana/ /opt/garmin-grafana/src/garmin_grafana/garmin_fetch.py </dev/null
fi
unset GARMIN_EMAIL GARMIN_PASSWORD GARMIN_MFA GARMIN_BASE64_PASSWORD
if [[ -z "$(ls -A /opt/garmin-grafana/.garminconnect)" ]]; then if [[ -z "$(ls -A /opt/garmin-grafana/.garminconnect)" ]]; then
msg_error "Failed to create token" msg_error "Failed to create token"
exit 1 exit 1