From 09e7b1fc4e97cc39ae14b3aabc99e8f5319c2d3f Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Sat, 9 Mar 2019 15:56:26 +0100
Subject: [PATCH] Aenderung fuer apache und ProFTPd noch nicht aktiv

---
 hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm          | 4 ++--
 hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java | 7 ++++++-
 hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm         | 2 +-
 hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm     | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index 7834096..029089f 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -3,7 +3,7 @@
 # Do not edit manually. Changes will be overwritten.
 #
 
-<VirtualHost ${pac.curINetAddr.inet4Addr}:80 ${pac.oldINetAddr.inet4Addr}:80 ${pac.curINetAddr.inet6Addr}:80 ${pac.oldINetAddr.inet6Addr}:80>
+<VirtualHost ${pac.curINetAddr.inet4Addr}:80 ${pac.oldINetAddr.inet4Addr}:80>
     ServerName ${dom.name}
     ServerAlias ${dom.serveraliases}
     ServerAdmin webmaster@${dom.name}
@@ -76,7 +76,7 @@
     Action application/x-httpd-php /fastcgi-bin/phpstub
 </VirtualHost>
 
-<VirtualHost ${pac.curINetAddr.inet4Addr}:443 ${pac.oldINetAddr.inet4Addr}:443 ${pac.curINetAddr.inet6Addr}:443 ${pac.oldINetAddr.inet6Addr}:443>
+<VirtualHost ${pac.curINetAddr.inet4Addr}:443 ${pac.oldINetAddr.inet4Addr}:443>
     ServerName ${dom.name}
     ServerAlias ${dom.serveraliases}
     ServerAdmin webmaster@${dom.name}
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
index 169c626..fdc8d2b 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -55,7 +55,12 @@ public class PacProcessorFactory implements EntityProcessorFactory {
 		Pac pac = (Pac) entity;
 		String basepacName = pac.getBasepac().getName();
 		if (basepacName.equals(BasePacType.PAC_WEB)) {
-			return createSetQuotaProc(pac);
+			Hive hive = pac.getHive();
+			return new CompoundProcessor(
+					createEtcHostsProc(hive),
+					createNetworkInterfacesProc(hive),
+					createSetQuotaProc(pac)
+				);
 		} else {
 			return new NullProcessor();
 		}
diff --git a/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm b/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm
index 13b9922..464d9a1 100644
--- a/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm
+++ b/hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm
@@ -4,7 +4,7 @@
 #
 
 #foreach( $pac in ${hive.webpacs} )
-<VirtualHost ${pac.curINetAddr.inet4Addr}:80 ${pac.curINetAddr.inet6Addr}:80>
+<VirtualHost ${pac.curINetAddr.inet4Addr}:80>
     ServerName _
     ServerAdmin webmaster@${pac.name}.hostsharing.net
 
diff --git a/hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm b/hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm
index cf86562..ec0ea6e 100644
--- a/hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm
+++ b/hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm
@@ -4,7 +4,7 @@
 #
 
 #foreach( $pac in ${hive.webpacs} )
-<VirtualHost ${pac.curINetAddr.inet4Addr} ${pac.curINetAddr.inet6Addr}>
+<VirtualHost ${pac.curINetAddr.inet4Addr}>
         DefaultRoot             ~ ${pac.name}
         ServerName              "${pac.name}.hostsharing.net"
         AllowOverwrite          on