diff --git a/CHANGELOG b/CHANGELOG index 904a6be9b..881f74d29 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed +- [SCRIPT] [WIPE] Fix HAProxy jail name ## [2.34.4] - 2025-12-17 diff --git a/home/jails.apache/.zfs-source/home/vlt-os/scripts/wipe_node.sh b/home/jails.apache/.zfs-source/home/vlt-os/scripts/wipe_node.sh index 7ecef2b92..36dcf22f4 100644 --- a/home/jails.apache/.zfs-source/home/vlt-os/scripts/wipe_node.sh +++ b/home/jails.apache/.zfs-source/home/vlt-os/scripts/wipe_node.sh @@ -39,9 +39,9 @@ done # Reset Haproxy configurations /bin/echo "Resetting Haproxy configurations..." -/usr/sbin/jexec hapropxy service haproxy stop +/usr/sbin/jexec haproxy service haproxy stop /usr/bin/find /usr/local/etc/haproxy.d/ -not -name backend_session.cfg -type f -delete -/usr/sbin/jexec hapropxy service haproxy start +/usr/sbin/jexec haproxy service haproxy start # Reset Redis /bin/echo "Resetting Redis configurations..." diff --git a/vulture_os/system/cluster/models.py b/vulture_os/system/cluster/models.py index a7ab2f5d8..50bc9f730 100644 --- a/vulture_os/system/cluster/models.py +++ b/vulture_os/system/cluster/models.py @@ -632,7 +632,7 @@ def get_certificate(self): def set_state(self, state): if state in [state_tmp for state_tmp, choice in STATE_CHOICES] and self._vstate != state: - logger.warn(f"[NODE SET STATE] State changed to: {state}") + logger.warning(f"[NODE SET STATE] State changed to: {state}") self._vstate = state self.save() diff --git a/vulture_os/system/netif/form.py b/vulture_os/system/netif/form.py index 200ea336d..aa88856c3 100644 --- a/vulture_os/system/netif/form.py +++ b/vulture_os/system/netif/form.py @@ -119,7 +119,7 @@ def clean_vlan(self): raise ValidationError("vlan must be 0 or an integer corresponding to VLAN ID") else: value = 0 - + return value def clean_fib(self): diff --git a/vulture_os/toolkit/network/network.py b/vulture_os/toolkit/network/network.py index d574aef53..cd7bfccee 100644 --- a/vulture_os/toolkit/network/network.py +++ b/vulture_os/toolkit/network/network.py @@ -502,7 +502,7 @@ def write_network_config(logger): def remove_netif_configs(logger, rc_confs): if isinstance(rc_confs, str): rc_confs = literal_eval(rc_confs) - + from system.cluster.models import Cluster node = Cluster.get_current_node() @@ -573,7 +573,7 @@ def make_hostname_resolvable(logger, hostname_ip): def delete_hostname(logger, hostname): """Remove hostname/IP from /etc/hosts - + :param logger: API logger (to be called by an API request) :param hostname: String containing the remote hostname to delete :return: