From c888350841acae3180ec6998e45c02b58625a9c5 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Thu, 22 Jun 2017 19:07:07 +0200 Subject: [PATCH] minor fixes --- .../src/de/hsadmin/mods/dom/DomainModuleImpl.java | 2 +- .../hsadmin/mods/dom/DomainProcessorFactory.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java index 5e59988..dc03b39 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java @@ -227,7 +227,7 @@ public class DomainModuleImpl extends AbstractModuleImpl { } for (DomainOption opt : domainOptions) { if ("letsencrypt".equals(opt.getName()) && updatedDom.getServeraliases().contains("*")) { - throw new HSAdminException("invalid domain option: " + opt.getName() + " for woldcard subdomain"); + throw new HSAdminException("invalid domain option: " + opt.getName() + " for wildcard subdomain"); } } needsWriteAccessOn(oldDom, "update"); diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 3a0e3ce..0474f1e 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -336,13 +336,20 @@ public class DomainProcessorFactory implements EntityProcessorFactory { return createLetencryptUnsetProcessor(dom); } else { // setup LE - return new ShellProcessor("mkdir -p /var/lib/letsencrypt/webroot/" + domName + + return new ShellProcessor( + "mkdir -p /var/lib/letsencrypt/webroot/" + domName + " && chown root:root /var/lib/letsencrypt/webroot/" + domName + " && chmod 0755 /var/lib/letsencrypt/webroot/" + domName + - " && mkdir -p /etc/letsencrypt/renwal/" + domName + + " && mkdir -p /var/lib/letsencrypt/webroot/" + domName + "/.well-known" + + " && chown root:root /var/lib/letsencrypt/webroot/" + domName + "/.well-known" + + " && chmod 0755 /var/lib/letsencrypt/webroot/" + domName + "/.well-known" + + " && mkdir -p /var/lib/letsencrypt/webroot/" + domName + "/.well-known/acme-challenge" + + " && chown root:root /var/lib/letsencrypt/webroot/" + domName + "/.well-known/acme-challenge" + + " && chmod 0755 /var/lib/letsencrypt/webroot/" + domName + "/.well-known/acme-challenge" + + " && mkdir -p /etc/letsencrypt/renewal/" + " && mkdir -p /etc/letsencrypt/live/" + domName + " && mkdir -p /etc/letsencrypt/archive/" + domName + - " && echo \"" + dom.getValidsubdomainnames() + "\" > /etc/letsencrypt/renwal/" + domName + ".conf" ); + " && echo \"subs=" + dom.getValidsubdomainnames() + "\" > /etc/letsencrypt/renewal/" + domName + ".conf" ); } } @@ -351,7 +358,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory { return new ShellProcessor("rm -rf /var/lib/letsencrypt/webroot/" + domName + " && rm -rf /etc/letsencrypt/archive/" + domName + " && rm -rf /etc/letsencrypt/live/" + domName + - " && rm -f /etc/letsencrypt/renwal/" + domName + ".conf"); + " && rm -f /etc/letsencrypt/renewal/" + domName + ".conf"); } }