diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-09-20 21:04:08 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-09-20 21:04:08 +0000 |
commit | 0c5449db2d4fb6a94132b76195c2e74617b9265c (patch) | |
tree | 0a6a22630b32bfb2cbd396020be0f63a9e4e4543 /etc/inc | |
parent | 2877eabaf6c780931bb68ad623e59db4e474cb86 (diff) | |
download | pfsense-0c5449db2d4fb6a94132b76195c2e74617b9265c.zip pfsense-0c5449db2d4fb6a94132b76195c2e74617b9265c.tar.gz |
Correctly set http/https port.
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/system.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index d74a7cd..0a3a250 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -387,10 +387,16 @@ EOD; } /* non-standard port? */ - if ($config['system']['webgui']['port']) + if ($config['system']['webgui']['port'] <> "") { $port = $config['system']['webgui']['port']; - else - $port = "80"; + } else { + if($config['webguiproto'] == "https") + $port = "443"; + elseif($config['webguiproto'] == "http") + $port = "80"; + else + $port = "80"; + } /* if we are strapped for memory, do not use fast cgi */ $memory = get_memory(); @@ -419,7 +425,7 @@ EOD; } function system_generate_lighty_config($filename, $cert, $key, $pid_file, - $port = "", $document_root = "/usr/local/www/", + $port, $document_root = "/usr/local/www/", $cert_location = "cert.pem", $max_procs, $max_requests = "1", $fast_cgi_enable = true) { |