tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2744 from Icinga/feature/make-arguments-of-the-cli-command-web-serve-non-positional-10682 

Feature/make arguments of the cli command web serve non positional 10682
This commit is contained in:
Eric Lippmann 2017-02-10 16:36:38 +01:00
parent 9c8da456f1 c015da7dfc
commit a8984d1c85
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
application/clicommands/WebCommand.php
View File

@ -9,6 +9,25 @@ use Icinga\Exception\IcingaException;
class WebCommand extends Command
{
/**
* Serve Icinga Web 2 with PHP's built-in web server
*
* USAGE
*
* icingacli web serve [options] [<document-root>]
*
* OPTIONS
*
* --daemonize Run in background
* --port=<port> The port to listen on
* --listen=<host:port> The address to listen on
* <document-root> The document root directory of Icinga Web 2 (e.g. ./public)
*
* EXAMPLES
*
* icingacli web serve --port=8080
* icingacli web serve --listen=127.0.0.1:8080 ./public
*/
public function serveAction()
{
$minVersion = '5.4.0';
@ -21,10 +40,15 @@ class WebCommand extends Command
}
$fork = $this->params->get('daemonize');
$listen = $this->params->get('listen');
$port = $this->params->get('port');
$documentRoot = $this->params->shift();
$socket = $this->params->shift();
if ($listen === null) {
$socket = $port === null ? $this->params->shift() : '0.0.0.0:' . $port;
} else {
$socket = $listen;
}
// TODO: Sanity check!!
if ($socket === null) {
$socket = $this->Config()->get('standalone', 'listen', '0.0.0.0:80');
}