From 3a7b867e833ebde34b734c5be780b4d27de6595a Mon Sep 17 00:00:00 2001
From: daniele <dbattelli@gmail.com>
Date: Sun, 9 Aug 2026 07:00:02 +0200
Subject: [PATCH] Backup automatico script del 2026-08-09 07:00

---
 configs/keepalived_pi1.conf               | 30 ++++++++++++++++++-----
 configs/keepalived_pi2.conf               | 26 +++++++++++++++++---
 scripts/pi1-master/weekly-maintenance.sh  |  2 +-
 services/telegram-bot/civil_protection.py |  8 ++++++
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/configs/keepalived_pi1.conf b/configs/keepalived_pi1.conf
index 5a7adf9..ba2d997 100644
--- a/configs/keepalived_pi1.conf
+++ b/configs/keepalived_pi1.conf
@@ -1,17 +1,35 @@
+global_defs {
+    enable_script_security
+    script_user root
+}
+
+vrrp_script chk_ha {
+    script "/usr/local/sbin/keepalived-check-ha.sh"
+    interval 5
+    weight -30
+    fall 3
+    rise 2
+    user root
+}
+
 vrrp_instance VI_1 {
-    state MASTER
+    state BACKUP
     interface eth0
     virtual_router_id 51
-    priority 101            # 101 = Priorità più alta (Master)
+    priority 101
     advert_int 1
+    preempt_delay 30
     authentication {
         auth_type PASS
         auth_pass @Dedelove1
     }
     virtual_ipaddress {
-        192.168.128.85      # Il nostro VIP
+        192.168.128.85
     }
-    notify_master "/home/daniely/rete/scripts/ha-failover.sh assume-tier-a"
-    notify_backup "/home/daniely/rete/scripts/ha-failover.sh release-tier-a"
-    notify_fault  "/home/daniely/rete/scripts/ha-failover.sh fault"
+    track_script {
+        chk_ha
+    }
+    notify_master "/usr/local/sbin/keepalived-notify-master.sh"
+    notify_backup "/usr/local/sbin/keepalived-notify-backup.sh"
+    notify_fault  "/usr/local/sbin/keepalived-notify-fault.sh"
 }
diff --git a/configs/keepalived_pi2.conf b/configs/keepalived_pi2.conf
index 96b52e7..3407c53 100644
--- a/configs/keepalived_pi2.conf
+++ b/configs/keepalived_pi2.conf
@@ -1,9 +1,24 @@
+global_defs {
+    enable_script_security
+    script_user root
+}
+
+vrrp_script chk_ha {
+    script "/usr/local/sbin/keepalived-check-ha.sh"
+    interval 5
+    weight -30
+    fall 3
+    rise 2
+    user root
+}
+
 vrrp_instance VI_1 {
     state BACKUP
     interface eth0
     virtual_router_id 51
-    priority 100            # 100 = Priorità più bassa (Backup)
+    priority 100
     advert_int 1
+    preempt_delay 30
     authentication {
         auth_type PASS
         auth_pass @Dedelove1
@@ -11,7 +26,10 @@ vrrp_instance VI_1 {
     virtual_ipaddress {
         192.168.128.85
     }
-    notify_master "/home/daniely/rete/scripts/ha-failover.sh assume-tier-a"
-    notify_backup "/home/daniely/rete/scripts/ha-failover.sh release-tier-a"
-    notify_fault  "/home/daniely/rete/scripts/ha-failover.sh fault"
+    track_script {
+        chk_ha
+    }
+    notify_master "/usr/local/sbin/keepalived-notify-master.sh"
+    notify_backup "/usr/local/sbin/keepalived-notify-backup.sh"
+    notify_fault  "/usr/local/sbin/keepalived-notify-fault.sh"
 }
diff --git a/scripts/pi1-master/weekly-maintenance.sh b/scripts/pi1-master/weekly-maintenance.sh
index 1acfddd..7eab67e 100755
--- a/scripts/pi1-master/weekly-maintenance.sh
+++ b/scripts/pi1-master/weekly-maintenance.sh
@@ -440,7 +440,7 @@ fi
 # 3. EEPROM firmware
 audit_eeprom
 
-# 4. Aggiornamento container Docker (Watchtower run-once, sostituisce il daemon schedulato)
+# 4. Aggiornamento container Docker (Watchtower run-once; il daemon è MONITOR_ONLY)
 run_watchtower
 
 # 5. Audit residui
diff --git a/services/telegram-bot/civil_protection.py b/services/telegram-bot/civil_protection.py
index 9c81c3e..1ac9c64 100644
--- a/services/telegram-bot/civil_protection.py
+++ b/services/telegram-bot/civil_protection.py
@@ -526,6 +526,14 @@ def main(chat_ids: Optional[List[str]] = None, debug_mode: bool = False):
         LOGGER.info("[DEBUG MODE] Bypass anti-spam: invio forzato")
     elif sig == last_sig:
         LOGGER.info("Allerta già notificata e invariata. Nessuna nuova notifica.")
+        # Aggiorna solo la data di calendario così Casa non tratta il bollettino
+        # come «di ieri» mentre le allerte regionali valgono ancora per oggi.
+        today = today_str_italy()
+        if state.get("date") != today:
+            state = dict(state)
+            state["date"] = today
+            save_state(state)
+            LOGGER.info("Stato DPC: date aggiornata a %s (firma invariata).", today)
         return
 
     # A questo punto: ci sono allerte e sono nuove -> prova invio