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

backward compatibility for updaters to update cron.d configuration file after update

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-12-06 16:47:16 +01:00
parent d7a2ec35cc
commit 6135ba8468
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql.php
View File

@@ -742,7 +742,7 @@ opcache.validate_timestamps'),
('panel', 'logo_overridecustom', '0'), ('panel', 'logo_overridecustom', '0'),
('panel', 'settings_mode', '0'), ('panel', 'settings_mode', '0'),
('panel', 'version', '2.0.0-beta1'), ('panel', 'version', '2.0.0-beta1'),
('panel', 'db_version', '202211030'); ('panel', 'db_version', '202212060');
DROP TABLE IF EXISTS `panel_tasks`; DROP TABLE IF EXISTS `panel_tasks`;

18
install/updates/froxlor/update_2.x.inc.php
View File

@@ -196,3 +196,21 @@ if (Froxlor::isDatabaseVersion('202112310')) {
Froxlor::updateToDbVersion('202211030'); Froxlor::updateToDbVersion('202211030');
} }
if (Froxlor::isDatabaseVersion('202211030')) {
Update::showUpdateStep("Creating backward compatibility for cronjob");
$complete_filedir = Froxlor::getInstallDir() . '/scripts';
mkdir($complete_filedir, 0750, true);
$newCronBin = Froxlor::getInstallDir().'/bin/froxlor-cli';
$compCron = <<<EOF
<?php
// re-create cron.d configuration file
exec('$newCronBin froxlor:cron -r 99');
exit;
EOF;
file_put_contents($complete_filedir.'/froxlor_master_cronjob.php', $compCron);
Update::lastStepStatus(0);
Froxlor::updateToDbVersion('202212060');
}

6
lib/Froxlor/Cli/MasterCron.php
View File

@@ -150,6 +150,12 @@ final class MasterCron extends CliCommand
// check for cron.d-generation task and create it if necessary // check for cron.d-generation task and create it if necessary
CronConfig::checkCrondConfigurationFile(); CronConfig::checkCrondConfigurationFile();
// check for old/compatibility cronjob file
if (file_exists(Froxlor::getInstallDir().'/scripts/froxlor_master_cronjob.php')) {
@unlink(Froxlor::getInstallDir().'/scripts/froxlor_master_cronjob.php');
@rmdir(Froxlor::getInstallDir().'/scripts');
}
// reset cronlog-flag if set to "once" // reset cronlog-flag if set to "once"
if ((int) Settings::Get('logger.log_cron') == 1) { if ((int) Settings::Get('logger.log_cron') == 1) {
FroxlorLogger::getInstanceOf()->setCronLog(0); FroxlorLogger::getInstanceOf()->setCronLog(0);

2
lib/Froxlor/Froxlor.php
View File

@@ -34,7 +34,7 @@ final class Froxlor
const VERSION = '2.0.0-beta1'; const VERSION = '2.0.0-beta1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202211030'; const DBVERSION = '202212060';
// Distribution branding-tag (used for Debian etc.) // Distribution branding-tag (used for Debian etc.)
const BRANDING = ''; const BRANDING = '';