hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Don't set permissions for key, cert, chain twice.

Browse Source
This commit is contained in:
Michael Hierweck 2017-06-28 07:30:57 +02:00
parent b3b02a77d8
commit 2e61e4c94f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -286,8 +286,7 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
+ "( ls " + domName + ".crt ||" + "( ls " + domName + ".crt ||"
+ " ( ln -s ../pems-generated/" + domName + ".key " + domName + ".key" + " ( ln -s ../pems-generated/" + domName + ".key " + domName + ".key"
+ " && ln -s ../pems-generated/" + domName + ".crt " + domName + ".crt" + " && ln -s ../pems-generated/" + domName + ".crt " + domName + ".crt"
+ " && ln -s ../pems-generated/" + domName + ".chain " + domName + ".chain ) ) && " + " && ln -s ../pems-generated/" + domName + ".chain " + domName + ".chain ) )"),
+ "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 CreateFileProcessor("/de/hsadmin/mods/dom/apache-vhost.vm", templateVars, dom, "/etc/apache2/sites-available/" + domName + ".tmp", "root", "root", "644", true),
new ShellProcessor( new ShellProcessor(
" (diff -q /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName + " && rm /etc/apache2/sites-available/" + domName + ".tmp ) " + " (diff -q /etc/apache2/sites-available/" + domName + ".tmp /etc/apache2/sites-available/" + domName + " && rm /etc/apache2/sites-available/" + domName + ".tmp ) " +