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

do not overwrite existing cert

Browse Source
This commit is contained in:
Peter Hormanns 2015-08-07 20:19:18 +02:00
parent 1041e6b152
commit b58321b42a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,8 +272,8 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-enabled/" + dom.getUser().getName() + " && " new ShellProcessor("export PEMS_DIR=/etc/apache2/pems-enabled/" + dom.getUser().getName() + " && "
+ "mkdir -p $PEMS_DIR/ && " + "mkdir -p $PEMS_DIR/ && "
+ "cd $PEMS_DIR && " + "cd $PEMS_DIR && "
+ "echo \"\" > " + domName + ".chain && " + "( ls " + domName + ".crt || ( echo \"\" > " + domName + ".chain && "
+ "openssl req -x509 -newkey rsa:2048 -keyout " + domName + ".key -out " + domName + ".crt -days 1100 -nodes -sha256 -subj '/CN=" + domName + "' &&" + "openssl req -x509 -newkey rsa:2048 -keyout " + domName + ".key -out " + domName + ".crt -days 1100 -nodes -sha256 -subj '/CN=" + domName + "' ) ) &&"
+ "chmod 400 " + domName + "*"), + "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(