Restart logging after restoring backup

Send SIGHUP to syslogd and suricata after restoring backup.  This ensures that
if the restored backup includes log files that any new log messages get
appended to the restored log files.  Otherwise they will be written to the
old log files which are pending deletion.

httpd is told to restart using apachectl, which is the equivalent of sending
a signal. 'graceful' (USR1) is used rather than 'restart' (HUP) because the
latter immediately kills the process restoring the backup, preventing
converters from running.

Fixes: 12196
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 6ac4e496737b62d4cd1ddbf1836b18eac3f1cc38..b1dd1d2978f926dadc24fe281af8dfd6b7a028df 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -71,6 +71,11 @@ restore_backup() {
 
        tar xvzpf "${filename}" -C /
 
+       # Restart syslogd, httpd and suricata in case we've just loaded old logs
+       apachectl -k graceful
+       /bin/kill -HUP `cat /var/run/suricata.pid 2> /dev/null` 2> /dev/null
+       /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null
+
        # Run converters
 
        # Outgoing Firewall