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

fix CLI scripts

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-22 10:36:01 +01:00
parent 0401e6971a
commit 685267d6fc
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Froxlor/Cli/Action/ConfigServicesAction.php
View File

@@ -29,8 +29,8 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
$this->_checkConfigParam(true); $this->_checkConfigParam(true);
$this->_parseConfig(); $this->_parseConfig();
require \Froxlor\Froxlor::getInstallDir() . '/lib/tables.inc.php'; require FROXLOR_INSTALL_DIR . '/lib/tables.inc.php';
require \Froxlor\Froxlor::getInstallDir() . '/lib/functions.php'; require FROXLOR_INSTALL_DIR . '/lib/functions.php';
if (array_key_exists("import-settings", $this->_args)) { if (array_key_exists("import-settings", $this->_args)) {
$this->_importSettings(); $this->_importSettings();
@@ -74,7 +74,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
'distro' => "" 'distro' => ""
); );
$config_dir = \Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/'; $config_dir = FROXLOR_INSTALL_DIR . '/lib/configfiles/';
// show list of available distro's // show list of available distro's
$distros = glob($config_dir . '*.xml'); $distros = glob($config_dir . '*.xml');
// tmp array // tmp array
@@ -162,11 +162,11 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
file_put_contents($output, $daemons_config); file_put_contents($output, $daemons_config);
ConfigServicesCmd::printsucc("Successfully generated service-configfile '" . $output . "'"); ConfigServicesCmd::printsucc("Successfully generated service-configfile '" . $output . "'");
echo PHP_EOL; echo PHP_EOL;
ConfigServicesCmd::printsucc("You can now apply this config running:" . PHP_EOL . "php " . __FILE__ . " --froxlor-dir=" . dirname(dirname(__DIR__)) . " --apply=" . $output); ConfigServicesCmd::printsucc("You can now apply this config running:" . PHP_EOL . "php " . FROXLOR_INSTALL_DIR . "/install/scripts/config-services.php --apply=" . $output);
echo PHP_EOL; echo PHP_EOL;
$proceed = ConfigServicesCmd::getYesNo("Do you want to apply the config now? [y/N]", 0); $proceed = ConfigServicesCmd::getYesNo("Do you want to apply the config now? [y/N]", 0);
if ($proceed) { if ($proceed) {
passthru("php " . __FILE__ . " --froxlor-dir=" . dirname(dirname(__DIR__)) . " --apply=" . $output); passthru("php " . FROXLOR_INSTALL_DIR . "/install/scripts/config-services.php --apply=" . $output);
} }
} }
@@ -236,7 +236,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
} }
if (! empty($decoded_config)) { if (! empty($decoded_config)) {
$config_dir = \Froxlor\Froxlor::getInstallDir() . '/lib/configfiles/'; $config_dir = FROXLOR_INSTALL_DIR . '/lib/configfiles/';
$configfiles = new \Froxlor\Config\ConfigParser($config_dir . '/' . $decoded_config['distro'] . ".xml"); $configfiles = new \Froxlor\Config\ConfigParser($config_dir . '/' . $decoded_config['distro'] . ".xml");
$services = $configfiles->getServices(); $services = $configfiles->getServices();
$replace_arr = $this->_getReplacerArray(); $replace_arr = $this->_getReplacerArray();
@@ -298,7 +298,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
// set is_configured flag // set is_configured flag
Settings::Set('panel.is_configured', '1', true); Settings::Set('panel.is_configured', '1', true);
// run cronjob at the end to ensure configs are all up to date // run cronjob at the end to ensure configs are all up to date
exec('php ' . \Froxlor\Froxlor::getInstallDir() . '/scripts/froxlor_master_cronjob.php --force'); exec('php ' . FROXLOR_INSTALL_DIR . '/scripts/froxlor_master_cronjob.php --force');
// and done // and done
ConfigServicesCmd::printsucc("All services have been configured"); ConfigServicesCmd::printsucc("All services have been configured");
} else { } else {
@@ -347,7 +347,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
'<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'), '<VIRTUAL_GID_MAPS>' => Settings::Get('system.vmail_gid'),
'<SSLPROTOCOLS>' => (Settings::Get('system.use_ssl') == '1') ? 'imaps pop3s' : '', '<SSLPROTOCOLS>' => (Settings::Get('system.use_ssl') == '1') ? 'imaps pop3s' : '',
'<CUSTOMER_TMP>' => \Froxlor\FileDir::makeCorrectDir($customer_tmpdir), '<CUSTOMER_TMP>' => \Froxlor\FileDir::makeCorrectDir($customer_tmpdir),
'<BASE_PATH>' => \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir()), '<BASE_PATH>' => \Froxlor\FileDir::makeCorrectDir(FROXLOR_INSTALL_DIR),
'<BIND_CONFIG_PATH>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.bindconf_directory')), '<BIND_CONFIG_PATH>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.bindconf_directory')),
'<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'), '<WEBSERVER_RELOAD_CMD>' => Settings::Get('system.apachereload_command'),
'<CUSTOMER_LOGS>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')), '<CUSTOMER_LOGS>' => \Froxlor\FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')),
@@ -359,11 +359,11 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
private function _parseConfig() private function _parseConfig()
{ {
define('\Froxlor\Froxlor::getInstallDir()', $this->_args['froxlor-dir']); define('FROXLOR_INSTALL_DIR', $this->_args['froxlor-dir']);
if (! file_exists(\Froxlor\Froxlor::getInstallDir() . '/lib/classes/database/class.Database.php')) { if (! class_exists('\\Froxlor\\Database\\Database')) {
throw new \Exception("Could not find froxlor's Database class. Is froxlor really installed to '" . \Froxlor\Froxlor::getInstallDir() . "'?"); throw new \Exception("Could not find froxlor's Database class. Is froxlor really installed to '" . FROXLOR_INSTALL_DIR . "'?");
} }
if (! file_exists(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php')) { if (! file_exists(FROXLOR_INSTALL_DIR . '/lib/userdata.inc.php')) {
throw new \Exception("Could not find froxlor's userdata.inc.php file. You should use this script only with a fully installed and setup froxlor system."); throw new \Exception("Could not find froxlor's userdata.inc.php file. You should use this script only with a fully installed and setup froxlor system.");
} }
} }
@@ -372,7 +372,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action
{ {
if ($needed) { if ($needed) {
if (! isset($this->_args["froxlor-dir"])) { if (! isset($this->_args["froxlor-dir"])) {
throw new \Exception("No configuration given (missing --froxlor-dir parameter?)"); $this->_args["froxlor-dir"] = \Froxlor\Froxlor::getInstallDir();
} elseif (! is_dir($this->_args["froxlor-dir"])) { } elseif (! is_dir($this->_args["froxlor-dir"])) {
throw new \Exception("Given --froxlor-dir parameter is not a directory"); throw new \Exception("Given --froxlor-dir parameter is not a directory");
} elseif (! file_exists($this->_args["froxlor-dir"])) { } elseif (! file_exists($this->_args["froxlor-dir"])) {

10
lib/Froxlor/Cli/Action/SwitchServerIpAction.php
View File

@@ -160,11 +160,11 @@ class SwitchServerIpAction extends \Froxlor\Cli\Action
private function _parseConfig() private function _parseConfig()
{ {
define('\Froxlor\Froxlor::getInstallDir()', $this->_args['froxlor-dir']); define('FROXLOR_INSTALL_DIR', $this->_args['froxlor-dir']);
if (! file_exists(\Froxlor\Froxlor::getInstallDir() . '/lib/classes/database/class.Database.php')) { if (! class_exists('\\Froxlor\\Database\\Database')) {
throw new \Exception("Could not find froxlor's Database class. Is froxlor really installed to '" . \Froxlor\Froxlor::getInstallDir() . "'?"); throw new \Exception("Could not find froxlor's Database class. Is froxlor really installed to '" . FROXLOR_INSTALL_DIR . "'?");
} }
if (! file_exists(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php')) { if (! file_exists(FROXLOR_INSTALL_DIR . '/lib/userdata.inc.php')) {
throw new \Exception("Could not find froxlor's userdata.inc.php file. You should use this script only with a fully installed and setup froxlor system."); throw new \Exception("Could not find froxlor's userdata.inc.php file. You should use this script only with a fully installed and setup froxlor system.");
} }
} }
@@ -173,7 +173,7 @@ class SwitchServerIpAction extends \Froxlor\Cli\Action
{ {
if ($needed) { if ($needed) {
if (! isset($this->_args["froxlor-dir"])) { if (! isset($this->_args["froxlor-dir"])) {
throw new \Exception("No configuration given (missing --froxlor-dir parameter?)"); $this->_args["froxlor-dir"] = \Froxlor\Froxlor::getInstallDir();
} elseif (! is_dir($this->_args["froxlor-dir"])) { } elseif (! is_dir($this->_args["froxlor-dir"])) {
throw new \Exception("Given --froxlor-dir parameter is not a directory"); throw new \Exception("Given --froxlor-dir parameter is not a directory");
} elseif (! file_exists($this->_args["froxlor-dir"])) { } elseif (! file_exists($this->_args["froxlor-dir"])) {

2
lib/Froxlor/Cli/ConfigServicesCmd.php
View File

@@ -42,7 +42,7 @@ class ConfigServicesCmd extends CmdLineHandler
'help' 'help'
); );
public static $action_class = 'ConfigServicesAction'; public static $action_class = '\\Froxlor\\Cli\\Action\\ConfigServicesAction';
public static function printHelp() public static function printHelp()
{ {

2
lib/Froxlor/Cli/SwitchServerIpCmd.php
View File

@@ -39,7 +39,7 @@ class SwitchServerIpCmd extends CmdLineHandler
'help' 'help'
); );
public static $action_class = 'SwitchServerIpAction'; public static $action_class = '\\Froxlor\\Cli\\Action\\SwitchServerIpAction';
public static function printHelp() public static function printHelp()
{ {