From bc64ff9123af65c26d0cc7783c6479d529e716c4 Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael@hierweck.de>
Date: Thu, 29 Jun 2017 14:13:03 +0200
Subject: [PATCH] Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hs.hsadmin

---
 hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
index 7d81a72..b8ff6b8 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
@@ -276,7 +276,9 @@
 		ifOption(templateVars, query, "multiviews", "+MultiViews", "-MultiViews");
 		ifOption(templateVars, query, "htdocsfallback", Boolean.TRUE, Boolean.FALSE);
 		ifOption(templateVars, query, "letsencrypt", Boolean.TRUE, Boolean.FALSE);
+		final boolean isSetLetsencryptOption = templateVars.get("letsencrypt").equals(Boolean.TRUE);
 		final Processor domSetupProcessor = new CompoundProcessor(
+			isSetLetsencryptOption ? new NullProcessor() : new ShellProcessor("rm -f /etc/apache2/pems-generated/" + domName + ".crt"),
 			new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-generated && "
 					+ "mkdir -p $PEMS_DIR && "
 					+ "cd $PEMS_DIR && "

--
Gitblit v1.9.0-SNAPSHOT