Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hs.hsadmin

Michael Hierweck

2017-06-29 bc64ff9123af65c26d0cc7783c6479d529e716c4

Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hs.hsadmin

 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 && "