resolve #19, Probleme mit Basepac

Peter Hormanns

2011-05-19 83a6dee5bd8de11a1b85b50da64546b3447d9794

resolve #19, Probleme mit Basepac

 hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java

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

 hsarback/src/de/hsadmin/mods/dom/htaccess.jtpl

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

 hsarback/src/de/hsadmin/mods/pac/Pac.java

@@ -85,7 +85,7 @@
    private BasePac basepac;
    
    public Pac() {
        basepac = null;
        basepac = new BasePac();
    }

    public Pac(String name, Customer cust, BasePac basePac, Hive hive) {