HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2019-03-09 09e7b1fc4e97cc39ae14b3aabc99e8f5319c2d3f
Aenderung fuer apache und ProFTPd noch nicht aktiv
4 files modified
15 ■■■■■ changed files
hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java 7 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/httpd-virtual.vm 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/proftpd-pacs-conf.vm 2 ●●● patch | view | raw | blame | history
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}
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -55,7 +55,12 @@
        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();
        }
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
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