mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-03 15:44:58 +02:00
Fix env vars not propagated to s6-overlay v3 services and disable forwarder when VPN not configured
- Add /etc/s6-overlay/s6-rc.d/*/run to the injection list in 00-global_var.sh so environment variables reach s6 v3 service run scripts (used by hotio containers) - Disable service-forwarder in 90-vpn.sh default case (no VPN provider) - Add VPN_AUTO_PORT_FORWARD=false check to explicitly disable forwarder Agent-Logs-Url: https://github.com/alexbelgium/hassio-addons/sessions/95bdc987-dd03-486d-bf05-6172624d1238 Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
8ce91f7e3e
commit
44ebe0e22f
@@ -234,7 +234,7 @@ cp "$ENV_FILE" "$ETC_ENV_FILE"
|
||||
################################################################################
|
||||
# Inject into scripts and shells (best-effort)
|
||||
################################################################################
|
||||
for f in /etc/services.d/*/run /etc/cont-init.d/*.sh /entrypoint.sh /etc/bash.bashrc "${GLOBAL_VAR_FILES:-}"; do
|
||||
for f in /etc/services.d/*/run /etc/s6-overlay/s6-rc.d/*/run /etc/cont-init.d/*.sh /entrypoint.sh /etc/bash.bashrc "${GLOBAL_VAR_FILES:-}"; do
|
||||
[[ -f "$f" ]] && inject_block "$f"
|
||||
done
|
||||
|
||||
|
||||
Reference in New Issue
Block a user