rework the reload function. we must change that to restart, because fail2ban does not apply all changes on reload only

This commit is contained in:
2025-02-26 17:44:13 +01:00
parent 25238bf83c
commit 2be263a4ff
10 changed files with 61 additions and 61 deletions

View File

@@ -43,7 +43,7 @@ type AppSettings struct {
Language string `json:"language"`
Port int `json:"port"`
Debug bool `json:"debug"`
ReloadNeeded bool `json:"reloadNeeded"`
RestartNeeded bool `json:"restartNeeded"`
AlertCountries []string `json:"alertCountries"`
SMTP SMTPSettings `json:"smtp"`
@@ -406,25 +406,25 @@ func GetSettings() AppSettings {
return currentSettings
}
// MarkReloadNeeded sets reloadNeeded = true and saves JSON
func MarkReloadNeeded() error {
// MarkRestartNeeded sets restartNeeded = true and saves JSON
func MarkRestartNeeded() error {
settingsLock.Lock()
defer settingsLock.Unlock()
currentSettings.ReloadNeeded = true
currentSettings.RestartNeeded = true
return saveSettings()
}
// MarkReloadDone sets reloadNeeded = false and saves JSON
func MarkReloadDone() error {
// MarkRestartDone sets restartNeeded = false and saves JSON
func MarkRestartDone() error {
settingsLock.Lock()
defer settingsLock.Unlock()
currentSettings.ReloadNeeded = false
currentSettings.RestartNeeded = false
return saveSettings()
}
// UpdateSettings merges new settings with old and sets reloadNeeded if needed
// UpdateSettings merges new settings with old and sets restartNeeded if needed
func UpdateSettings(new AppSettings) (AppSettings, error) {
settingsLock.Lock()
defer settingsLock.Unlock()
@@ -442,15 +442,15 @@ func UpdateSettings(new AppSettings) (AppSettings, error) {
old.Destemail != new.Destemail ||
//old.Sender != new.Sender {
old.Maxretry != new.Maxretry {
new.ReloadNeeded = true
new.RestartNeeded = true
} else {
// preserve previous ReloadNeeded if it was already true
new.ReloadNeeded = new.ReloadNeeded || old.ReloadNeeded
// preserve previous RestartNeeded if it was already true
new.RestartNeeded = new.RestartNeeded || old.RestartNeeded
}
// Countries change? Currently also requires a reload
if !equalStringSlices(old.AlertCountries, new.AlertCountries) {
new.ReloadNeeded = true
new.RestartNeeded = true
}
currentSettings = new

View File

@@ -3,8 +3,8 @@
"nav.dashboard": "Dashboard",
"nav.filter_debug": "Filter-Debug",
"nav.settings": "Einstellungen",
"reload_banner.message": "Konfiguration geändert!",
"reload_banner.button": "Fail2ban neu laden",
"restart_banner.message": "Fail2ban Konfiguration geändert! Um Änderungen zu übernehmen bitte: ",
"restart_banner.button": "Service neu starten",
"dashboard.title": "Dashboard",
"dashboard.overview": "Aktive Jails und Blocks Übersicht",
"dashboard.search_label": "Suche gesperrte IPs",

View File

@@ -3,8 +3,8 @@
"nav.dashboard": "Dashboard",
"nav.filter_debug": "Filter Debug",
"nav.settings": "Istellige",
"reload_banner.message": "D'Konfiguration isch gänderet worde!",
"reload_banner.button": "Fail2ban neu lade",
"restart_banner.message": "Fail2ban Konfiguration gänderet! Für d'Änderige z'überneh, bitte: ",
"restart_banner.button": "Service neu starte",
"dashboard.title": "Dashboard",
"dashboard.overview": "Übersicht vo de aktive Jails und Blocks",
"dashboard.search_label": "Suech nach g'sperrte IPs",

View File

@@ -3,8 +3,8 @@
"nav.dashboard": "Dashboard",
"nav.filter_debug": "Filter Debug",
"nav.settings": "Settings",
"reload_banner.message": "Configuration changed!",
"reload_banner.button": "Reload Fail2ban",
"restart_banner.message": "Fail2ban configuration changed! To apply the changes, please: ",
"restart_banner.button": "Restart Service",
"dashboard.title": "Dashboard",
"dashboard.overview": "Overview active Jails and Blocks",
"dashboard.search_label": "Search Banned IPs",

View File

@@ -3,8 +3,8 @@
"nav.dashboard": "Panel de control",
"nav.filter_debug": "Depuración de filtros",
"nav.settings": "Configuración",
"reload_banner.message": La configuración ha sido modificada!",
"reload_banner.button": "Recargar Fail2ban",
"restart_banner.message": Configuración de Fail2ban modificada! Para aplicar los cambios, por favor: ",
"restart_banner.button": "Reiniciar servicio",
"dashboard.title": "Panel de control",
"dashboard.overview": "Resumen de Jails y Bloqueos activos",
"dashboard.search_label": "Buscar IP bloqueadas",

View File

@@ -3,8 +3,8 @@
"nav.dashboard": "Tableau de bord",
"nav.filter_debug": "Débogage des filtres",
"nav.settings": "Paramètres",
"reload_banner.message": "Configuration modifiée!",
"reload_banner.button": "Recharger Fail2ban",
"restart_banner.message": "Configuration Fail2ban modifiée ! Pour appliquer les changements, veuillez: ",
"restart_banner.button": "Redémarrer le service",
"dashboard.title": "Tableau de bord",
"dashboard.overview": "Vue d'ensemble des jails et blocages actifs",
"dashboard.search_label": "Rechercher des IP bloquées",

View File

@@ -3,8 +3,8 @@
"nav.dashboard": "Cruscotto",
"nav.filter_debug": "Debug Filtro",
"nav.settings": "Impostazioni",
"reload_banner.message": "Configurazione modificata!",
"reload_banner.button": "Ricarica Fail2ban",
"restart_banner.message": "Configurazione di Fail2ban modificata! Per applicare le modifiche, per favore: ",
"restart_banner.button": "Riavvia il servizio",
"dashboard.title": "Cruscotto",
"dashboard.overview": "Panoramica dei jail e dei blocchi attivi",
"dashboard.search_label": "Cerca IP bloccate",