From 0d4ed40cb21daa6d830491d32af235a8fd84f36c Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 13 Nov 2014 12:52:21 +0100 Subject: [PATCH] CLI/Webserver Setup: Remove sapi stuff becuase it's nowhere used refs #6120 --- .../application/clicommands/ConfigCommand.php | 4 --- modules/setup/library/Setup/Webserver.php | 27 ------------------- 2 files changed, 31 deletions(-) diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php index 606b0d74c..c4e4c1520 100644 --- a/modules/setup/application/clicommands/ConfigCommand.php +++ b/modules/setup/application/clicommands/ConfigCommand.php @@ -101,9 +101,6 @@ class ConfigCommand extends Command $this->fail($this->translate('Unknown type') . ': ' . $type); } $webserver->setApp($this->app); - if (($sapi = $this->params->get('sapi', 'server')) === null) { - $this->fail($this->translate('argument --sapi is mandatory.')); - } if (($path = $this->params->get('path', '/icingaweb')) === null) { $this->fail($this->translate('argument --path is mandatory.')); } @@ -112,7 +109,6 @@ class ConfigCommand extends Command } $webserver->setWebPath($path); $webserver->setPublicPath($publicPath); - $webserver->setSapi($sapi); $config = $webserver->generate() . "\n"; if (($file = $this->params->get('file')) !== null) { if (file_exists($file) === true) { diff --git a/modules/setup/library/Setup/Webserver.php b/modules/setup/library/Setup/Webserver.php index e06e9ed5f..708c366b8 100644 --- a/modules/setup/library/Setup/Webserver.php +++ b/modules/setup/library/Setup/Webserver.php @@ -19,13 +19,6 @@ abstract class Webserver */ protected $webPath; - /** - * SAPI name (e.g for cgi config generation) - * - * @var string - */ - protected $sapi; - /** * System path to public documents * @@ -88,26 +81,6 @@ abstract class Webserver */ abstract protected function getTemplate(); - /** - * Setter for SAPI name - * - * @param string $sapi - */ - public function setSapi($sapi) - { - $this->sapi = $sapi; - } - - /** - * Getter for SAPI name - * - * @return string - */ - public function getSapi() - { - return $this->sapi; - } - /** * Setter for web path *