diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-03-01 10:35:15 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-03-01 10:35:15 +0000 |
| commit | c6e1b0f5efa81ba7bef267551b7013916611049a (patch) | |
| tree | e2ac12254ac0fcccb4932f749b288a3a4fdde7fe /etc/inc/captiveportal.inc | |
| parent | ceccec870ece46b2a66e88b7a7f9669bf74205e3 (diff) | |
| download | pfsense-c6e1b0f5efa81ba7bef267551b7013916611049a.zip pfsense-c6e1b0f5efa81ba7bef267551b7013916611049a.tar.gz | |
Add intermmediate certificate support to CP config page.
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index eadf231..a8e5fe9 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -243,10 +243,14 @@ EOD; if(isset($config['captiveportal']['httpslogin'])) { $cert = base64_decode($config['captiveportal']['certificate']); + if (isset($config['captiveportal']['cacertificate'])) + $cacert = base64_decode($config['captiveportal']['cacertificate']); + else + $cacert = ""; $key = base64_decode($config['captiveportal']['private-key']); /* generate lighttpd configuration */ system_generate_lighty_config("{$g['varetc_path']}/lighty-CaptivePortal-SSL.conf", - $cert, $key, "", "lighty-CaptivePortal-ssl.pid", "8001", "/usr/local/captiveportal/", + $cert, $key, $cacert, "lighty-CaptivePortal-ssl.pid", "8001", "/usr/local/captiveportal/", "cert-portal.pem", "ca-portal.pem", "1", $maxproc, $use_fastcgi, true); } |
