stable #2

Merged
alientim merged 89 commits from stable into dev 2024-11-15 10:37:11 +01:00
Showing only changes of commit 859759a253 - Show all commits

View File

@@ -12,15 +12,10 @@ update_watchdog_config() {
watchdog=$(sudo cat /var/lib/dhcp/* | grep -a "option watchdog" | tail -1 | \ watchdog=$(sudo cat /var/lib/dhcp/* | grep -a "option watchdog" | tail -1 | \
awk '{for (i=3; i<=NF; i++) printf "%s ", $i}' | tr -d '";') awk '{for (i=3; i<=NF; i++) printf "%s ", $i}' | tr -d '";')
# Split the watchdog IPs into an array IFS=', ' read -r -a ip_array <<< "$watchdog" # Split IPs by comma or space
IFS=',' read -r -a ip_array <<< "$watchdog"
# Backup current configuration # Backup current configuration
if sudo cp "$config_file" "$config_file.bak"; then sudo cp "$config_file" "$config_file.bak"
echo "Backup of $config_file created successfully." >> "$log_file"
else
echo "Failed to create backup of $config_file." >> "$log_file"
fi
# Clean existing configurations # Clean existing configurations
sudo sed -i '/ping/d' "$config_file" sudo sed -i '/ping/d' "$config_file"
@@ -29,48 +24,35 @@ update_watchdog_config() {
# Set interval # Set interval
echo "interval = 58" | sudo tee -a "$config_file" > /dev/null echo "interval = 58" | sudo tee -a "$config_file" > /dev/null
# Check if IP addresses are found and add them to the config if [ ${#ip_array[@]} -eq 0 ]; then
if [ ${#ip_array[@]} -gt 0 ]; then echo "No IP addresses found. Watchdog configuration cleared." >> "$log_file"
return 0 # No IP addresses to configure
else
# Insert IPs into config
for ip in "${ip_array[@]}"; do for ip in "${ip_array[@]}"; do
echo "ping = $ip" | sudo tee -a "$config_file" > /dev/null echo "ping = $ip" | sudo tee -a "$config_file" > /dev/null
echo "Configured watchdog to ping: $ip" >> "$log_file"
done done
echo "Configured watchdog to ping: ${ip_array[*]}" >> "$log_file"
# Restart watchdog service since IP addresses were found # Restart watchdog service
if sudo systemctl restart watchdog; then sudo systemctl restart watchdog
echo "Watchdog service restarted successfully." >> "$log_file" return 1 # IP addresses were configured
else
echo "Failed to restart watchdog service." >> "$log_file"
fi
return 1 # Indicate that IP addresses were found
fi fi
echo "No IP addresses found. Watchdog configuration cleared." >> "$log_file"
return 0 # Indicate that no IP addresses were found
} }
# Main loop
start_time=$(date +%s)
end_time=$((start_time + 300)) # 5 minutes in seconds
interval=30 # Initial interval of 30 seconds
while true; do while true; do
# Check if IP addresses are found and watchdog is updated
if update_watchdog_config; then if update_watchdog_config; then
echo "IP addresses found and watchdog restarted. Exiting loop." >> "$log_file" echo "IP addresses found and watchdog restarted. Exiting loop." >> "$log_file"
break # Exit the loop if IP addresses were found break
else else
echo "No IP addresses found. Waiting for $interval seconds before checking again..." >> "$log_file" echo "No IP addresses found. Waiting for $interval seconds before checking again..." >> "$log_file"
fi fi
current_time=$(date +%s) # Check time limit
if [ "$(date +%s)" -ge "$end_time" ]; then
# Check if 5 minutes have passed
if [ "$current_time" -ge "$end_time" ]; then
echo "5 minutes have passed. Stopping the watchdog service." >> "$log_file" echo "5 minutes have passed. Stopping the watchdog service." >> "$log_file"
sudo systemctl stop watchdog sudo systemctl stop watchdog
break # Exit the loop break
fi fi
echo "Waiting for $interval seconds before checking for IP addresses again..." >> "$log_file" echo "Waiting for $interval seconds before checking for IP addresses again..." >> "$log_file"