2 files changed, 33 insertions, 6 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 1d85cc51..1e403c48 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -818,15 +818,9 @@ function haproxy_writeconf($configpath) {
 	if(is_array($a_frontends)) {
 		foreach ($a_frontends as $frontend) {
 			if($frontend['status'] != 'active')
-			{
-				unlink_if_exists("var/etc/{$frontend['name']}.{$frontend['port']}.crt");
 				continue;
-			}
 			if(!$frontend['backend_serverpool'])
-			{
-				unlink_if_exists("var/etc/{$frontend['name']}.{$frontend['port']}.crt");
 				continue;
-			}
 			$primaryfrontend = get_primaryfrontend($frontend);
 			$bname = get_frontend_ipport($frontend);
 
@@ -1192,6 +1186,36 @@ function haproxy_plugin_carp($pluginparams) {
 	haproxy_check_run(0);
 }
 
+function haproxy_plugin_certificates($pluginparams) {
+	global $config;
+	$result = array();
+	if ($pluginparams['type'] == 'certificates' && $pluginparams['event'] == 'used_certificates') {
+		$result['pkgname'] = "HAProxy";
+		$result['certificatelist'] = array();
+		// return a array of used certificates.
+		foreach($config['installedpackages']['haproxy']['ha_backends']['item'] as &$frontend) {
+			$mainfrontend = get_primaryfrontend($frontend);
+			if (strtolower($mainfrontend['type']) == "http" && $mainfrontend['ssloffload']) {
+				if ($frontend['ssloffloadacl']){
+					$item = array();
+					$cert = $frontend['ssloffloadcert'];
+					$item['usedby'] = $frontend['name'];
+					$result['certificatelist'][$cert][] = $item;
+				}
+				if ($frontend['ssloffloadacladditional']){
+					foreach($frontend['ha_certificates']['item'] as $certref){
+						$item = array();
+						$cert = $certref['ssl_certificate'];
+						$item['usedby'] = $frontend['name'];
+						$result['certificatelist'][$cert][] = $item;
+					}
+				}
+			}
+		}
+	}
+	return $result;
+}
+
 function haproxy_check_run($reload) {
 	global $config, $g, $haproxy_run_message;
 
diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml
index 5c534522..acd934a7 100644
--- a/config/haproxy-devel/haproxy.xml
+++ b/config/haproxy-devel/haproxy.xml
@@ -62,6 +62,9 @@
 		<item>
 			<type>plugin_carp</type>
 		</item>
+		<item>
+			<type>plugin_certificates</type>
+		</item>
 	</plugins>
 	<configpath>installedpackages->haproxy->config</configpath>
 	<additional_files_needed>