From b22842eb7db3946a36bba1d5a0eb6d2f13b82a59 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Wed, 28 Jun 2017 15:01:45 +0200
Subject: [PATCH] remove certs on domain remove

---
 .../de/hsadmin/mods/dom/DomainProcessorFactory.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
index 7aaece7..d15f0cf 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -79,16 +79,9 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
 		}
 		mainProcessor.appendProcessor(dom.getHiveName(), createApacheVHostDeleteProcessor(dom), "remove apache vhost");
 		mainProcessor.appendProcessor(dom.getHiveName(), createACMEBotProcessor(em, dom), "remove letsencrypt config");
-		mainProcessor.appendProcessor(dom.getHiveName(), createRemoveCertsProcessor(dom), "remove letsencrypt certs");
 		return mainProcessor;
 	}
 
-	private ShellProcessor createRemoveCertsProcessor(Domain dom) {
-		return new ShellProcessor("rm -f /etc/apache2/pems-generated/" + dom.getName() + ".crt && "
-				+ "rm -f /etc/apache2/pems-generated/" + dom.getName() + ".key && "
-				+ "rm -f /etc/apache2/pems-generated/" + dom.getName() + ".chain ");
-	}
-
 	private Processor createDNSServerConfigProcessor(EntityManager em) {
 		Query query = em.createQuery("SELECT d FROM Domains d");		
 		HashMap<String, Object> templateVars = new HashMap<String, Object>();
@@ -325,9 +318,9 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
 				" && rm -f /etc/apache2/pems-enabled/" + domName + ".crt" +
 				" && rm -f /etc/apache2/pems-enabled/" + domName + ".key" +
 				" && rm -f /etc/apache2/pems-enabled/" + domName + ".chain" +
-				" && rm -f /etc/apache2/pems-generated/_." + domName + ".crt" +
-				" && rm -f /etc/apache2/pems-generated/_." + domName + ".key" +
-				" && rm -f /etc/apache2/pems-generated/_." + domName + ".chain" +
+				" && rm -f /etc/apache2/pems-generated/" + domName + ".crt" +
+				" && rm -f /etc/apache2/pems-generated/" + domName + ".key" +
+				" && rm -f /etc/apache2/pems-generated/" + domName + ".chain" +
 				" && rm -rf " + dom.getUser().getHomedir() + "/doms/" + domName +
 				" && invoke-rc.d apache2 reload >/dev/null 2>&1");
 		return vhostDelProcessor;