From 73182a6909dfb0a3ea3e8ca4cc08dadc245a2c31 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 12 May 2024 11:09:48 +0200 Subject: [PATCH] check for already existing symlink to bin/froxlor-cli; remove some very old dkim related settings Signed-off-by: Michael Kaufmann --- install/updates/froxlor/update_2.2.inc.php | 4 ++++ lib/configfiles/bookworm.xml | 2 +- lib/configfiles/bullseye.xml | 2 +- lib/configfiles/focal.xml | 2 +- lib/configfiles/jammy.xml | 2 +- lib/configfiles/noble.xml | 4 +++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/install/updates/froxlor/update_2.2.inc.php b/install/updates/froxlor/update_2.2.inc.php index a94c714e..bd102889 100644 --- a/install/updates/froxlor/update_2.2.inc.php +++ b/install/updates/froxlor/update_2.2.inc.php @@ -55,6 +55,10 @@ if (Froxlor::isFroxlorVersion('2.1.9')) { Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_domains';"); Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_algorithm';"); Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_notes';"); + Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_add_adsp';"); + Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_dkimkeys';"); + Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_servicetype';"); + Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'dkim' AND `varname` = 'dkim_add_adsppolicy';"); Update::lastStepStatus(0); if ($antispam_activated) { diff --git a/lib/configfiles/bookworm.xml b/lib/configfiles/bookworm.xml index 754e23b0..e00236bd 100644 --- a/lib/configfiles/bookworm.xml +++ b/lib/configfiles/bookworm.xml @@ -3499,7 +3499,7 @@ aliases: files - bin/froxlor-cli /usr/local/bin/froxlor-cli]]> + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml index addfb8d3..aaedc027 100644 --- a/lib/configfiles/bullseye.xml +++ b/lib/configfiles/bullseye.xml @@ -5062,7 +5062,7 @@ aliases: files - bin/froxlor-cli /usr/local/bin/froxlor-cli]]> + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml index 56838f43..dfda6e05 100644 --- a/lib/configfiles/focal.xml +++ b/lib/configfiles/focal.xml @@ -4289,7 +4289,7 @@ aliases: files - bin/froxlor-cli /usr/local/bin/froxlor-cli]]> + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/jammy.xml b/lib/configfiles/jammy.xml index cfa0b6e5..e1f5dab7 100644 --- a/lib/configfiles/jammy.xml +++ b/lib/configfiles/jammy.xml @@ -4286,7 +4286,7 @@ aliases: files - bin/froxlor-cli /usr/local/bin/froxlor-cli]]> + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]> diff --git a/lib/configfiles/noble.xml b/lib/configfiles/noble.xml index e25771c6..85039e4d 100644 --- a/lib/configfiles/noble.xml +++ b/lib/configfiles/noble.xml @@ -3678,6 +3678,8 @@ ModuleControlsACLs lsmod allow user * LoadModule mod_ctrls_admin.c LoadModule mod_tls.c +LoadModule mod_ident.c + # Install one of proftpd-mod-mysql, proftpd-mod-pgsql or any other # SQL backend engine to use this module and the required backend. # This module must be mandatory loaded before anyone of @@ -4286,7 +4288,7 @@ aliases: files - bin/froxlor-cli /usr/local/bin/froxlor-cli]]> + bin/froxlor-cli /usr/local/bin/froxlor-cli]]> bin/froxlor-cli froxlor:cron --run-task 99]]>