From 83a6dee5bd8de11a1b85b50da64546b3447d9794 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@hostsharing.net>
Date: Thu, 19 May 2011 18:03:59 +0200
Subject: [PATCH] resolve #19, Probleme mit Basepac
---
hsarback/src/de/hsadmin/mods/dom/htaccess.jtpl | 2 +-
hsarback/src/de/hsadmin/mods/pac/Pac.java | 2 +-
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
index c6aea6f..b395cb1 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
+++ b/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")
);
diff --git a/hsarback/src/de/hsadmin/mods/dom/htaccess.jtpl b/hsarback/src/de/hsadmin/mods/dom/htaccess.jtpl
index 660f423..3df1d9f 100644
--- a/hsarback/src/de/hsadmin/mods/dom/htaccess.jtpl
+++ b/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 -->
\ No newline at end of file
diff --git a/hsarback/src/de/hsadmin/mods/pac/Pac.java b/hsarback/src/de/hsadmin/mods/pac/Pac.java
index 1fb53fb..2930bd0 100644
--- a/hsarback/src/de/hsadmin/mods/pac/Pac.java
+++ b/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) {
--
Gitblit v1.9.3