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

Aenderung fuer apache und ProFTPd noch nicht aktiv

Browse Source
This commit is contained in:
Peter Hormanns 2019-03-09 15:56:26 +01:00
parent dfe33257b7
commit 09e7b1fc4e
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
View File

@ -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}

7
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -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();
}

2
hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm
View File

@ -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

2
hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm
View File

@ -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