diff options
| author | Ermal Luçi <ermal.luci@gmail.com> | 2012-12-17 02:46:12 -0800 |
|---|---|---|
| committer | Ermal Luçi <ermal.luci@gmail.com> | 2012-12-17 02:46:12 -0800 |
| commit | 5c600edde7b1109f0b08327642f9096e35207fb5 (patch) | |
| tree | 1bf4173c7de55e2bc99ac45c9aa97e2d9f009837 /etc/inc/captiveportal.inc | |
| parent | aea564088a335bef9c9d6fb55409dd0ad65b3049 (diff) | |
| parent | 09b09d0481aa3ee7e0538ef965f2832fdb6ea017 (diff) | |
| download | pfsense-5c600edde7b1109f0b08327642f9096e35207fb5.zip pfsense-5c600edde7b1109f0b08327642f9096e35207fb5.tar.gz | |
Merge pull request #284 from bcyrill/cp_certs
Allow multiple cp zones with different ssl certs
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index a6c1e9b..c6706b3 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -429,14 +429,14 @@ function captiveportal_init_webgui_zone($cpcfg) { $listenporthttps = $cpcfg['listenporthttps'] ? $cpcfg['listenporthttps'] : ($cpcfg['zoneid'] + 1); system_generate_lighty_config("{$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal-SSL.conf", $crt, $key, $ca, "lighty-{$cpzone}-CaptivePortal-SSL.pid", $listenporthttps, "/usr/local/captiveportal", - "cert-portal.pem", "ca-portal.pem", "1", $use_fastcgi, $cpzone); + "cert-{$cpzone}-portal.pem", "ca-{$cpzone}-portal.pem", "1", $use_fastcgi, $cpzone); } /* generate lighttpd configuration */ $listenporthttp = $cpcfg['listenporthttp'] ? $cpcfg['listenporthttp'] : $cpcfg['zoneid']; system_generate_lighty_config("{$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal.conf", "", "", "", "lighty-{$cpzone}-CaptivePortal.pid", $listenporthttp, "/usr/local/captiveportal", - "cert-portal.pem", "ca-portal.pem", "1", $use_fastcgi, $cpzone); + "", "", "1", $use_fastcgi, $cpzone); /* attempt to start lighttpd */ $res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal.conf"); |
