aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2015-03-08 14:51:14 +0100
committerPiBa-NL <pba_2k3@yahoo.com>2015-03-08 14:51:14 +0100
commit8ea139b506b56aa0dc35c74102f8cc561aedf8d7 (patch)
tree06c9183e2bcc164c5fb7a67e5fce7b9ba2b39354 /config
parentb21069b07582b7828edd781dfbcab72fbddc9c55 (diff)
downloadpfsense-packages-8ea139b506b56aa0dc35c74102f8cc561aedf8d7.tar.gz
pfsense-packages-8ea139b506b56aa0dc35c74102f8cc561aedf8d7.tar.bz2
pfsense-packages-8ea139b506b56aa0dc35c74102f8cc561aedf8d7.zip
haproxy-devel, allow haproxy to use the same certificate as what is used for the webgui when it has been configured with a 'real' certificate
Diffstat (limited to 'config')
-rw-r--r--config/haproxy-devel/pkg/haproxy_utils.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/haproxy-devel/pkg/haproxy_utils.inc b/config/haproxy-devel/pkg/haproxy_utils.inc
index 4b945c06..d8c4faf4 100644
--- a/config/haproxy-devel/pkg/haproxy_utils.inc
+++ b/config/haproxy-devel/pkg/haproxy_utils.inc
@@ -354,7 +354,7 @@ function haproxy_get_certificates($type = 'server,user', $get_includeWebCert=fal
$ok |= stristr($type,',user,') && $purpose['server'] != 'Yes';
if (!$ok)
continue;
- if ($get_includeWebCert == false && is_webgui_cert($cert['refid']))
+ if ($get_includeWebCert == false && $cert['descr'] == "webConfigurator default")
continue;
$certificates[$cert['refid']]['name'] = haproxy_get_certificate_descriptivename($cert);
}