From b58321b42a813749c894581d45c5188100bd27cc Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Fri, 7 Aug 2015 20:19:18 +0200 Subject: [PATCH] do not overwrite existing cert --- hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 2c6fd98..feab37b 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -272,8 +272,8 @@ public class DomainProcessorFactory implements EntityProcessorFactory { new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-enabled/" + dom.getUser().getName() + " && " + "mkdir -p $PEMS_DIR/ && " + "cd $PEMS_DIR && " - + "echo \"\" > " + domName + ".chain && " - + "openssl req -x509 -newkey rsa:2048 -keyout " + domName + ".key -out " + domName + ".crt -days 1100 -nodes -sha256 -subj '/CN=" + domName + "' &&" + + "( ls " + domName + ".crt || ( echo \"\" > " + domName + ".chain && " + + "openssl req -x509 -newkey rsa:2048 -keyout " + domName + ".key -out " + domName + ".crt -days 1100 -nodes -sha256 -subj '/CN=" + domName + "' ) ) &&" + "chmod 400 " + domName + "*"), new CreateFileProcessor("/de/hsadmin/mods/dom/apache-vhost.vm", templateVars, dom, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true), new ShellProcessor(