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

added new indicator whether services/system has been configured (on new installations); show alternative configuration possibility via config-services.php script

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-10 20:34:43 +01:00
parent d381528c06
commit 4988600881
10 changed files with 103 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
install/scripts/config-services.php
View File

@@ -236,6 +236,10 @@ class Action
$_daemons_config[$si][] = $sysservice;
}
} while (! empty($sysservice));
// add 'cron' as fixed part (doesn't hurt if it exists)
if (!in_array('cron', $_daemons_config[$si])) {
$_daemons_config[$si][] = 'cron';
}
} else {
// for all others -> only one value
while (! array_key_exists($_daemons_config[$si], $daemons)) {
@@ -249,6 +253,9 @@ class Action
$output = CmdLineHandler::getInput("choose output-filename", "/tmp/froxlor-config-" . date('Ymd') . ".json");
file_put_contents($output, $daemons_config);
CmdLineHandler::printsucc("Successfully generated service-configfile '" . $output . "'");
echo PHP_EOL;
CmdLineHandler::printsucc("You can now apply this config running:" . PHP_EOL . "php " . __FILE__ . " --froxlor-dir=" . dirname(dirname(__DIR__)) . " --apply=" . $output);
echo PHP_EOL;
}
private function getCompleteDistroName($cparser)
@@ -342,10 +349,11 @@ class Action
}
// run all cmds
$confarr = $dd->getConfig();
foreach ($confarr as $idx => $action) {
foreach ($confarr as $action) {
switch ($action['type']) {
case "install":
CmdLineHandler::println("Installing required packages");
$result = null;
passthru(strtr($action['content'], $replace_arr), $result);
if (strlen($result) > 1) {
echo $result;
@@ -375,6 +383,8 @@ class Action
}
}
}
// set is_configured flag
Settings::Set('panel.is_configured', '1', true);
// run cronjob at the end to ensure configs are all up to date
exec('php ' . FROXLOR_INSTALL_DIR . '/scripts/froxlor_master_cronjob.php --force');
// and done