From 8f850ee7f3c9339db0c09793496474fe6ab1f41c Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 6 Oct 2019 22:54:54 +0200 Subject: [PATCH] simplify config-templates for cronjob setup Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cli/Action/ConfigServicesAction.php | 2 +- lib/Froxlor/Cron/MasterCron.php | 11 ++++++++++- lib/configfiles/bionic.xml | 16 +--------------- lib/configfiles/buster.xml | 16 +--------------- lib/configfiles/gentoo.xml | 16 +--------------- lib/configfiles/jessie.xml | 16 +--------------- lib/configfiles/rhel_centos.xml | 16 +--------------- lib/configfiles/stretch.xml | 16 +--------------- lib/configfiles/trusty.xml | 16 +--------------- lib/configfiles/xenial.xml | 16 +--------------- 10 files changed, 19 insertions(+), 122 deletions(-) diff --git a/lib/Froxlor/Cli/Action/ConfigServicesAction.php b/lib/Froxlor/Cli/Action/ConfigServicesAction.php index ca472b10..fccddc5f 100644 --- a/lib/Froxlor/Cli/Action/ConfigServicesAction.php +++ b/lib/Froxlor/Cli/Action/ConfigServicesAction.php @@ -103,7 +103,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action echo PHP_EOL; while (! in_array($_daemons_config['distro'], $distributions_select_data)) { - $_daemons_config['distro'] = ConfigServicesCmd::getInput("choose distribution", "stretch"); + $_daemons_config['distro'] = ConfigServicesCmd::getInput("choose distribution", "buster"); } // go through all services and let user check whether to include it or not diff --git a/lib/Froxlor/Cron/MasterCron.php b/lib/Froxlor/Cron/MasterCron.php index 3179efb0..0c4c88e4 100644 --- a/lib/Froxlor/Cron/MasterCron.php +++ b/lib/Froxlor/Cron/MasterCron.php @@ -44,8 +44,9 @@ class MasterCron extends \Froxlor\Cron\FroxlorCron echo "Below are possible parameters for this file\n\n"; echo "--[cronname]\t\tincludes the given cron-file\n"; echo "--force\t\t\tforces re-generating of config-files (webserver, nameserver, etc.)\n"; + echo "--run-task\t\trun a specific task [1 = re-generate configs, 4 = re-generate dns zones, 10 = re-set quotas, 99 = re-create cron.d-file]\n"; echo "--debug\t\t\toutput debug information about what is going on to STDOUT.\n"; - echo "--no-fork\t\t\tdo not fork to backkground (traffic cron only).\n\n"; + echo "--no-fork\t\tdo not fork to backkground (traffic cron only).\n\n"; } /** @@ -75,6 +76,14 @@ class MasterCron extends \Froxlor\Cron\FroxlorCron define('CRON_DEBUG_FLAG', 1); } elseif (strtolower($argv[$x]) == '--no-fork') { define('CRON_NOFORK_FLAG', 1); + } elseif (strtolower($argv[$x]) == '--run-task') { + if (isset($argv[$x+1]) && in_array($argv[$x+1], [1,4,10,99])) { + \Froxlor\System\Cronjob::inserttask($argv[$x+1]); + array_push($jobs_to_run, 'tasks'); + } else { + echo "Invalid argument for --run-task\n"; + exit; + } } elseif (substr(strtolower($argv[$x]), 0, 2) == '--') { // --[cronname] if (strlen($argv[$x]) > 3) { diff --git a/lib/configfiles/bionic.xml b/lib/configfiles/bionic.xml index a716e732..1c94f11b 100644 --- a/lib/configfiles/bionic.xml +++ b/lib/configfiles/bionic.xml @@ -4539,21 +4539,7 @@ UPLOADGID= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/buster.xml b/lib/configfiles/buster.xml index 82e1fa63..d95e6d02 100644 --- a/lib/configfiles/buster.xml +++ b/lib/configfiles/buster.xml @@ -4741,21 +4741,7 @@ UPLOADGID= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index e84a4439..9f77e247 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -3657,21 +3657,7 @@ account required pam_mysql.so user= passwd= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index d3ebfae2..f46d836f 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -4461,21 +4461,7 @@ UPLOADGID= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index 4f3c1e3d..3f6ab36a 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -2289,21 +2289,7 @@ ControlsLog /var/log/proftpd/controls.log - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/stretch.xml b/lib/configfiles/stretch.xml index 4c9c540c..6d717862 100644 --- a/lib/configfiles/stretch.xml +++ b/lib/configfiles/stretch.xml @@ -4528,21 +4528,7 @@ UPLOADGID= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index 512cc921..e9a1cf4d 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -1546,21 +1546,7 @@ UPLOADGID= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]> diff --git a/lib/configfiles/xenial.xml b/lib/configfiles/xenial.xml index c4c379c7..0345c524 100644 --- a/lib/configfiles/xenial.xml +++ b/lib/configfiles/xenial.xml @@ -4539,21 +4539,7 @@ UPLOADGID= - - scripts/froxlor_master_cronjob.php -]]> - - + scripts/froxlor_master_cronjob.php --run-task 99]]>