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

resolve #19, Probleme mit Basepac

Browse Source
This commit is contained in:
Peter Hormanns 2011-05-19 16:03:59 +00:00
parent eb9c4b0a80
commit 83a6dee5bd
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,9 +113,11 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
templateVars = new HashMap<String, String>(); templateVars = new HashMap<String, String>();
templateVars.put("DOMAIN", domName); templateVars.put("DOMAIN", domName);
templateVars.put("USER_NAME", domUser.getComment()); templateVars.put("USER_NAME", domUser.getComment());
templateVars.put("PROTOCOL", "http");
domDirsProcessor.appendProcessor( domDirsProcessor.appendProcessor(
new CreateFileProcessor("/de/hsadmin/mods/dom/htaccess.jtpl", templateVars, domainDir + "/htdocs/.htaccess", userName, pacName, "644") new CreateFileProcessor("/de/hsadmin/mods/dom/htaccess.jtpl", templateVars, domainDir + "/htdocs/.htaccess", userName, pacName, "644")
); );
templateVars.put("PROTOCOL", "https");
domDirsProcessor.appendProcessor( domDirsProcessor.appendProcessor(
new CreateFileProcessor("/de/hsadmin/mods/dom/htaccess.jtpl", templateVars, domainDir + "/htdocs-ssl/.htaccess", userName, pacName, "644") new CreateFileProcessor("/de/hsadmin/mods/dom/htaccess.jtpl", templateVars, domainDir + "/htdocs-ssl/.htaccess", userName, pacName, "644")
); );

2
hsarback/src/de/hsadmin/mods/dom/htaccess.jtpl
View File

@ -1,2 +1,2 @@
<!-- BEGIN: main -->Redirect permanent / http://www.{DOMAIN}/ <!-- BEGIN: main -->Redirect permanent / {PROTOCOL}://www.{DOMAIN}/
<!-- END: main --> <!-- END: main -->

2
hsarback/src/de/hsadmin/mods/pac/Pac.java
View File

@ -85,7 +85,7 @@ public class Pac extends AbstractEntity implements Serializable {
private BasePac basepac; private BasePac basepac;
public Pac() { public Pac() {
basepac = null; basepac = new BasePac();
} }
public Pac(String name, Customer cust, BasePac basePac, Hive hive) { public Pac(String name, Customer cust, BasePac basePac, Hive hive) {