From 8ea139b506b56aa0dc35c74102f8cc561aedf8d7 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Sun, 8 Mar 2015 14:51:14 +0100 Subject: 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 --- config/haproxy-devel/pkg/haproxy_utils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/haproxy-devel') 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); } -- cgit v1.2.3