Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hs.hsadmin
This commit is contained in:
commit
bc64ff9123
@ -276,7 +276,9 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
|
||||
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 && "
|
||||
|
Loading…
Reference in New Issue
Block a user