summaryrefslogtreecommitdiffstats
path: root/etc/inc/system.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-11-29 06:33:49 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-11-29 06:33:49 +0000
commit1b2db323aae5315f72acbb231f1b0820880671e8 (patch)
tree75814f4490d2b0383dcac88f12e69b80c30ca260 /etc/inc/system.inc
parent04b44931aacab1ddd93b30d61e959b2b501e1e94 (diff)
downloadpfsense-1b2db323aae5315f72acbb231f1b0820880671e8.zip
pfsense-1b2db323aae5315f72acbb231f1b0820880671e8.tar.gz
* Correct argument order
* If user selects HTTPS but doesn't provide a port, default to 443
Diffstat (limited to 'etc/inc/system.inc')
-rw-r--r--etc/inc/system.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index a7b88e7..c9a2d3e 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -352,6 +352,9 @@ function system_webgui_start() {
if ($config['system']['webgui']['protocol'] == "https") {
+ if(!$config['system']['webgui']['port'])
+ $portarg = "443";
+
if ($config['system']['webgui']['certificate'] && $config['system']['webgui']['private-key']) {
$cert = base64_decode($config['system']['webgui']['certificate']);
$key = base64_decode($config['system']['webgui']['private-key']);
@@ -403,7 +406,7 @@ EOD;
/* generate lighttpd configuration */
system_generate_lighty_config("{$g['varetc_path']}/lighty-webConfigurator.conf",
- $key, $cert, "lighty-webConfigurator.pid", $portarg, "/usr/local/www/");
+ $cert, $key, "lighty-webConfigurator.pid", $portarg, "/usr/local/www/");
/* attempt to start lighthttpd */
$res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-webConfigurator.conf");
OpenPOWER on IntegriCloud