diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-08-24 18:15:25 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-08-24 18:15:25 -0400 |
| commit | d43ad788f295023f6e7d923fa07f0928a9a270d0 (patch) | |
| tree | 4c8d54143bcab1e79440ee837b57ba0395549253 /etc/inc/captiveportal.inc | |
| parent | af539291187b159b4c7ddab791536f59193c21ea (diff) | |
| parent | 29dc1e6e81998c881c15c08c526d7de65ff8e76b (diff) | |
| download | pfsense-d43ad788f295023f6e7d923fa07f0928a9a270d0.zip pfsense-d43ad788f295023f6e7d923fa07f0928a9a270d0.tar.gz | |
Merge branch 'master' of git://rcs.pfsense.org/pfsense/nigel-ca-chain into review/master
Conflicts:
etc/inc/certs.inc
etc/inc/upgrade_config.inc
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 59c39ee..a3a80a5 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -226,14 +226,14 @@ EOD; $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-portal.pem", "1", $maxproc, $use_fastcgi, true); + $cert, $key, "", "lighty-CaptivePortal-ssl.pid", "8001", "/usr/local/captiveportal/", + "cert-portal.pem", "ca-portal.pem", "1", $maxproc, $use_fastcgi, true); } /* generate lighttpd configuration */ system_generate_lighty_config("{$g['varetc_path']}/lighty-CaptivePortal.conf", - "", "", "lighty-CaptivePortal.pid", "8000", "/usr/local/captiveportal/", - "cert-portal.pem", "1", $maxproc, $use_fastcgi, true); + "", "", "", "lighty-CaptivePortal.pid", "8000", "/usr/local/captiveportal/", + "cert-portal.pem", "ca-portal.pem", "1", $maxproc, $use_fastcgi, true); /* attempt to start lighttpd */ $res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-CaptivePortal.conf"); |
