[PATCH 1/2] backup.pl: Include logwatch summary into backups as well

[PATCH 1/2] backup.pl: Include logwatch summary into backups as well

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]

Fixes: 12827
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 config/backup/backup.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 7094ed610..762437321 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -191,7 +191,7 @@ restore_backup() {
 }
 
 find_logfiles() {
-	local filelist=( /var/log/messages* /var/log/*.log /var/log/**/*.log )
+	local filelist=( /var/log/logwatch/* /var/log/messages* /var/log/*.log /var/log/**/*.log )
 
 	echo "${filelist[@]}"
 }
-- 
2.35.3

[PATCH 2/2] backup.pl: Delete directives for dropped OpenVPN convert script

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 588 bytes --]

See 0b6d12adae7f41bb31f6b361b2d6a90057de7867.

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 config/backup/backup.pl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 762437321..54957a814 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -157,9 +157,6 @@ restore_backup() {
 	# Reload firewall
 	firewallctrl
 
-	# Convert old OpenVPN CCD files (CN change, Core Update 75)
-	convert-ovpn
-
 	# Snort to suricata converter.
 	if [ -d "/var/ipfire/snort" ]; then
 		# Run converter
-- 
2.35.3

Re: [PATCH 1/2] backup.pl: Include logwatch summary into backups as well

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 09/07/2022 12:21, Peter Müller wrote:
> Fixes: 12827
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
>   config/backup/backup.pl | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
> index 7094ed610..762437321 100644
> --- a/config/backup/backup.pl
> +++ b/config/backup/backup.pl
> @@ -2,7 +2,7 @@
>   ###############################################################################
>   #                                                                             #
>   # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2014  IPFire Team  <info(a)ipfire.org>                     #
> +# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
>   #                                                                             #
>   # This program is free software: you can redistribute it and/or modify        #
>   # it under the terms of the GNU General Public License as published by        #
> @@ -191,7 +191,7 @@ restore_backup() {
>   }
>   
>   find_logfiles() {
> -	local filelist=( /var/log/messages* /var/log/*.log /var/log/**/*.log )
> +	local filelist=( /var/log/logwatch/* /var/log/messages* /var/log/*.log /var/log/**/*.log )
>   
>   	echo "${filelist[@]}"
>   }

Re: [PATCH 2/2] backup.pl: Delete directives for dropped OpenVPN convert script

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 09/07/2022 12:21, Peter Müller wrote:
> See 0b6d12adae7f41bb31f6b361b2d6a90057de7867.
>
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
>   config/backup/backup.pl | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
> index 762437321..54957a814 100644
> --- a/config/backup/backup.pl
> +++ b/config/backup/backup.pl
> @@ -157,9 +157,6 @@ restore_backup() {
>   	# Reload firewall
>   	firewallctrl
>   
> -	# Convert old OpenVPN CCD files (CN change, Core Update 75)
> -	convert-ovpn
> -
>   	# Snort to suricata converter.
>   	if [ -d "/var/ipfire/snort" ]; then
>   		# Run converter