mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-03-25 07:21:39 +01:00
Compare commits
2 Commits
master
...
copilot/fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6aa65891a2 | ||
|
|
13064eb864 |
@@ -1,5 +1,6 @@
|
|||||||
## 5.1.4-19 (24-03-2026)
|
## 5.1.4-19 (24-03-2026)
|
||||||
- Minor bugs fixed
|
- Fix OpenVPN not connecting: restore missing openvpn package in Dockerfile
|
||||||
|
|
||||||
## 5.1.4-18 (22-03-2026)
|
## 5.1.4-18 (22-03-2026)
|
||||||
- Minor bugs fixed
|
- Minor bugs fixed
|
||||||
## 5.1.4-17 (17-02-2026)
|
## 5.1.4-17 (17-02-2026)
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_auto
|
|||||||
# && chmod a+x /etc/s6-overlay/s6-rc.d/$SCRIPTSNAME/* ; done; fi
|
# && chmod a+x /etc/s6-overlay/s6-rc.d/$SCRIPTSNAME/* ; done; fi
|
||||||
|
|
||||||
# Manual apps
|
# Manual apps
|
||||||
ARG PACKAGES="ipcalc wireguard-tools libnatpmp iptables ip6tables"
|
ARG PACKAGES="openvpn ipcalc wireguard-tools libnatpmp iptables ip6tables"
|
||||||
|
|
||||||
# Automatic apps & bashio
|
# Automatic apps & bashio
|
||||||
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
|
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
|
||||||
|
|||||||
@@ -347,10 +347,8 @@ _wireguard_up() {
|
|||||||
|
|
||||||
# Add routing rules for VPN interface and DNS servers
|
# Add routing rules for VPN interface and DNS servers
|
||||||
_routing_add || return 1
|
_routing_add || return 1
|
||||||
# Add firewall rules for VPN interface (only when UPnP port mapping is enabled)
|
# Add firewall rules for VPN interface
|
||||||
if bashio::config.true 'vpn_upnp_enabled'; then
|
_firewall_add || return 1
|
||||||
_firewall_add || bashio::log.warning "Firewall rules could not be applied (non-fatal)."
|
|
||||||
fi
|
|
||||||
# Update resolv.conf with VPN DNS servers
|
# Update resolv.conf with VPN DNS servers
|
||||||
_resolvconf "update" || return 1
|
_resolvconf "update" || return 1
|
||||||
# Wait for handshake to be established before returning success
|
# Wait for handshake to be established before returning success
|
||||||
@@ -362,10 +360,8 @@ _wireguard_down() {
|
|||||||
_resolvconf "reset" || true
|
_resolvconf "reset" || true
|
||||||
# Remove routing rules for VPN interface and DNS servers
|
# Remove routing rules for VPN interface and DNS servers
|
||||||
_routing_del || true
|
_routing_del || true
|
||||||
# Remove firewall rules for VPN interface (only when UPnP port mapping is enabled)
|
# Remove firewall rules for VPN interface
|
||||||
if bashio::config.true 'vpn_upnp_enabled'; then
|
_firewall_del || true
|
||||||
_firewall_del || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
_cmd "ip link set ${config["Interface"]} down" 2>/dev/null || true
|
_cmd "ip link set ${config["Interface"]} down" 2>/dev/null || true
|
||||||
_cmd "ip link del ${config["Interface"]}" 2>/dev/null || true
|
_cmd "ip link del ${config["Interface"]}" 2>/dev/null || true
|
||||||
@@ -525,17 +521,13 @@ _openvpn_up() {
|
|||||||
_openvpn_down() {
|
_openvpn_down() {
|
||||||
# Terminate OpenVPN process
|
# Terminate OpenVPN process
|
||||||
pkill -f "openvpn --config ${config["ConfigFile"]}" || true
|
pkill -f "openvpn --config ${config["ConfigFile"]}" || true
|
||||||
# Safety-net cleanup in case the --down callback was never invoked
|
|
||||||
_routing_del || true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_openpvn_postup() {
|
_openpvn_postup() {
|
||||||
# Add routing rules for VPN interface and DNS servers
|
# Add routing rules for VPN interface and DNS servers
|
||||||
_routing_add || return 1
|
_routing_add || return 1
|
||||||
# Add firewall rules for VPN interface (only when UPnP port mapping is enabled)
|
# Add firewall rules for VPN interface
|
||||||
if bashio::config.true 'vpn_upnp_enabled'; then
|
_firewall_add || return 1
|
||||||
_firewall_add || bashio::log.warning "Firewall rules could not be applied (non-fatal)."
|
|
||||||
fi
|
|
||||||
# Update resolv.conf with VPN DNS servers
|
# Update resolv.conf with VPN DNS servers
|
||||||
_resolvconf "update" || return 1
|
_resolvconf "update" || return 1
|
||||||
}
|
}
|
||||||
@@ -545,10 +537,8 @@ _openpvn_postdown() {
|
|||||||
_resolvconf "reset" || true
|
_resolvconf "reset" || true
|
||||||
# Remove routing rules for VPN interface and DNS servers
|
# Remove routing rules for VPN interface and DNS servers
|
||||||
_routing_del || true
|
_routing_del || true
|
||||||
# Remove firewall rules for VPN interface (only when UPnP port mapping is enabled)
|
# Remove firewall rules for VPN interface
|
||||||
if bashio::config.true 'vpn_upnp_enabled'; then
|
_firewall_del || true
|
||||||
_firewall_del || true
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
openvpn() {
|
openvpn() {
|
||||||
|
|||||||
Reference in New Issue
Block a user