maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

check for already existing symlink to bin/froxlor-cli; remove some very old dkim related settings

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2024-05-12 11:09:48 +02:00
parent 0d86340a4c
commit 73182a6909
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/updates/froxlor/update_2.2.inc.php
View File

@@ -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_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_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_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); Update::lastStepStatus(0);
if ($antispam_activated) { if ($antispam_activated) {

2
lib/configfiles/bookworm.xml
View File

@@ -3499,7 +3499,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor" <daemon name="cron" title="Cronjob for froxlor"
mandatory="true"> mandatory="true">
<install><![CDATA[apt-get install cron gnupg]]></install> <install><![CDATA[apt-get install cron gnupg]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command> <command><![CDATA[[ ! -e /usr/local/bin/froxlor-cli ] && ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command> <command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command> <command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon> </daemon>

2
lib/configfiles/bullseye.xml
View File

@@ -5062,7 +5062,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor" <daemon name="cron" title="Cronjob for froxlor"
mandatory="true"> mandatory="true">
<install><![CDATA[apt-get install cron gnupg]]></install> <install><![CDATA[apt-get install cron gnupg]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command> <command><![CDATA[[ ! -e /usr/local/bin/froxlor-cli ] && ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command> <command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command> <command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon> </daemon>

2
lib/configfiles/focal.xml
View File

@@ -4289,7 +4289,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor" <daemon name="cron" title="Cronjob for froxlor"
mandatory="true"> mandatory="true">
<install><![CDATA[apt-get install cron gnupg]]></install> <install><![CDATA[apt-get install cron gnupg]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command> <command><![CDATA[[ ! -e /usr/local/bin/froxlor-cli ] && ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command> <command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command> <command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon> </daemon>

2
lib/configfiles/jammy.xml
View File

@@ -4286,7 +4286,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor" <daemon name="cron" title="Cronjob for froxlor"
mandatory="true"> mandatory="true">
<install><![CDATA[apt-get install cron gnupg]]></install> <install><![CDATA[apt-get install cron gnupg]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command> <command><![CDATA[[ ! -e /usr/local/bin/froxlor-cli ] && ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command> <command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command> <command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon> </daemon>

4
lib/configfiles/noble.xml
View File

@@ -3678,6 +3678,8 @@ ModuleControlsACLs lsmod allow user *
LoadModule mod_ctrls_admin.c LoadModule mod_ctrls_admin.c
LoadModule mod_tls.c LoadModule mod_tls.c
LoadModule mod_ident.c
# Install one of proftpd-mod-mysql, proftpd-mod-pgsql or any other # Install one of proftpd-mod-mysql, proftpd-mod-pgsql or any other
# SQL backend engine to use this module and the required backend. # SQL backend engine to use this module and the required backend.
# This module must be mandatory loaded before anyone of # This module must be mandatory loaded before anyone of
@@ -4286,7 +4288,7 @@ aliases: files
<daemon name="cron" title="Cronjob for froxlor" <daemon name="cron" title="Cronjob for froxlor"
mandatory="true"> mandatory="true">
<install><![CDATA[apt-get install cron gnupg]]></install> <install><![CDATA[apt-get install cron gnupg]]></install>
<command><![CDATA[ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command> <command><![CDATA[[ ! -e /usr/local/bin/froxlor-cli ] && ln -s <BASE_PATH>bin/froxlor-cli /usr/local/bin/froxlor-cli]]></command>
<command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command> <command><![CDATA[/usr/bin/php <BASE_PATH>bin/froxlor-cli froxlor:cron --run-task 99]]></command>
<command><![CDATA[{{settings.system.crondreload}}]]></command> <command><![CDATA[{{settings.system.crondreload}}]]></command>
</daemon> </daemon>