tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLI/Webserver Setup: Don't use camelCase arguments

Browse Source 
refs #6120
This commit is contained in:
Eric Lippmann 2014-11-13 13:40:39 +01:00
parent e0f6ce36ea
commit a0d4b6eee6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/setup/application/clicommands/ConfigCommand.php
View File

@ -73,18 +73,18 @@ class ConfigCommand extends Command
* *
* OPTIONS: * OPTIONS:
* *
* --path=<webpath> Path for the web server, default /icingaweb * --path=<urlpath> The URL path to Icinga Web 2
* *
* --publicPath=<wwwroot> Path to htdocs system path * --root/--document-root=<directory> The directory from which the webserver will serve files
* *
* --file=<filename> Write configuration to file * --file=<filename> Write configuration to file
* *
* *
* EXAMPLES: * EXAMPLES:
* *
* icingacli setup config webserver apache * icingacli setup config webserver apache
* *
* icingacli setup config webserver apache --path /icingaweb --publicPath /usr/share/icingaweb/public * icingacli setup config webserver apache --path /icingaweb --document-root /usr/share/icingaweb/public
* *
* icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb.conf * icingacli setup config webserver apache --file /etc/apache2/conf.d/icingaweb.conf
* *
@ -104,10 +104,10 @@ class ConfigCommand extends Command
if (! is_string($path) || strlen(trim($path)) === 0) { if (! is_string($path) || strlen(trim($path)) === 0) {
$this->fail($this->translate('The argument --path expects a URL path')); $this->fail($this->translate('The argument --path expects a URL path'));
} }
$documentRoot = $this->params->get('documentRoot', $webserver->getDocumentRoot()); $documentRoot = $this->params->get('root', $this->params->get('document-root', $webserver->getDocumentRoot()));
if (! is_string($documentRoot) || strlen(trim($documentRoot)) === 0) { if (! is_string($documentRoot) || strlen(trim($documentRoot)) === 0) {
$this->fail($this->translate( $this->fail($this->translate(
'The argument --documentRoot expects a directory from which the webserver will serve files' 'The argument --root/--document-root expects a directory from which the webserver will serve files'
)); ));
} }
$webserver->setWebPath($path); $webserver->setWebPath($path);