Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hs.hsadmin
| | |
| | | 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 && " |