diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-07-06 09:41:50 -0300 |
| commit | 1623ed9700dd89ee871313add2c4947c1227cc39 (patch) | |
| tree | f1809bd8552dd406bcef2cad32b982516c0262fb /etc/inc/captiveportal.inc | |
| parent | 4842755397c92f1c16b50b16e01b28768f8b43c1 (diff) | |
| parent | f49c41c538e718d06b44e9c2d279ba9b9580b5ff (diff) | |
| download | pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.zip pfsense-1623ed9700dd89ee871313add2c4947c1227cc39.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/priv.defs.inc
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index a6bdb33..a31b28c 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -413,7 +413,7 @@ function captiveportal_init_webgui() { $key = base64_decode($config['captiveportal']['private-key']); /* generate lighttpd configuration */ system_generate_lighty_config("{$g['varetc_path']}/lighty-CaptivePortal-SSL.conf", - $cert, $key, $cacert, "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); } |
