merge IPv6 changes
This commit is contained in:
Michael Hierweck
Peter Hormanns
parent
2019e012ff
commit
c09e9bba2e
@ -3,7 +3,7 @@
|
||||
# Do not edit manually. Changes will be overwritten.
|
||||
#
|
||||
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:80 ${pac.oldINetAddr.inetAddr}:80>
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:80 ${pac.oldINetAddr.inetAddr}:80 ${pac.curINet6Addr.inetAddr}:80 ${pac.oldINet6Addr.inetAddr}: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.inetAddr}:443 ${pac.oldINetAddr.inetAddr}:443>
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:443 ${pac.oldINetAddr.inetAddr}:443 ${pac.curINet6Addr.inetAddr}:443 ${pac.oldINet6Addr.inetAddr}:443>
|
||||
ServerName ${dom.name}
|
||||
ServerAlias ${dom.serveraliases}
|
||||
ServerAdmin webmaster@${dom.name}
|
||||
@ -124,6 +124,10 @@
|
||||
Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
|
||||
</Location>
|
||||
|
||||
#if( ${phplatest} )
|
||||
FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
|
||||
|
||||
#end
|
||||
RewriteEngine On
|
||||
RewriteOptions Inherit
|
||||
|
||||
|
||||
@ -1,24 +1,26 @@
|
||||
$TTL 6H
|
||||
${dom.name}. IN SOA ${dom.dnsMaster}.hostsharing.net. hostmaster.hostsharing.net. (
|
||||
${sio} ; serial secs since Jan 1 1970
|
||||
6H ; refresh (>=10000)
|
||||
1H ; retry (>=1800)
|
||||
1W ; expire
|
||||
1H ; minimum
|
||||
${sio} ; serial secs since Jan 1 1970
|
||||
6H ; refresh (>=10000)
|
||||
1H ; retry (>=1800)
|
||||
1W ; expire
|
||||
1H ; minimum
|
||||
)
|
||||
|
||||
${dom.name}. IN NS dns1.hostsharing.net.
|
||||
${dom.name}. IN NS dns2.hostsharing.net.
|
||||
${dom.name}. IN NS dns3.hostsharing.net.
|
||||
${dom.name}. IN NS dns1.hostsharing.net.
|
||||
${dom.name}. IN NS dns2.hostsharing.net.
|
||||
${dom.name}. IN NS dns3.hostsharing.net.
|
||||
|
||||
${dom.name}. IN MX 30 mailin1.hostsharing.net.
|
||||
${dom.name}. IN MX 30 mailin2.hostsharing.net.
|
||||
${dom.name}. IN MX 30 mailin3.hostsharing.net.
|
||||
${dom.name}. IN MX 30 mailin1.hostsharing.net.
|
||||
${dom.name}. IN MX 30 mailin2.hostsharing.net.
|
||||
${dom.name}. IN MX 30 mailin3.hostsharing.net.
|
||||
|
||||
${dom.name}. IN A ${pac.curINetAddr.inetAddr}
|
||||
${dom.name}. IN A ${pac.curINetAddr.inetAddr}
|
||||
;${dom.name}. IN AAAA ${pac.curINet6Addr.inetAddr}
|
||||
|
||||
*.${dom.name}. IN MX 30 mailin1.hostsharing.net.
|
||||
*.${dom.name}. IN MX 30 mailin2.hostsharing.net.
|
||||
*.${dom.name}. IN MX 30 mailin3.hostsharing.net.
|
||||
*.${dom.name}. IN MX 30 mailin1.hostsharing.net.
|
||||
*.${dom.name}. IN MX 30 mailin2.hostsharing.net.
|
||||
*.${dom.name}. IN MX 30 mailin3.hostsharing.net.
|
||||
|
||||
*.${dom.name}. IN A ${pac.curINetAddr.inetAddr}
|
||||
*.${dom.name}. IN A ${pac.curINetAddr.inetAddr}
|
||||
;*.${dom.name}. IN AAAA ${pac.curINet6Addr.inetAddr}
|
||||
|
||||
@ -176,21 +176,29 @@ public class PacProcessorFactory implements EntityProcessorFactory {
|
||||
}
|
||||
|
||||
private Processor createIfUp(final Pac pac) {
|
||||
// return new ShellProcessor("ifup eth0:" + pacName);
|
||||
return new ShellProcessor("ip addr add "
|
||||
return new CompoundProcessor(new ShellProcessor("ip addr add "
|
||||
+ pac.getCurINetAddr().getInetAddr()
|
||||
+ "/32 dev eth0 label eth0:"
|
||||
+ "/32 dev eth0"
|
||||
+ pac.getName()
|
||||
);
|
||||
),
|
||||
new ShellProcessor("ip addr add "
|
||||
+ pac.getCurINet6Addr().getInetAddr()
|
||||
+ "/128 dev eth0 noprefixroute preferred_lft 0"
|
||||
+ pac.getName()
|
||||
));
|
||||
}
|
||||
|
||||
private Processor createIfDown(final Pac pac) {
|
||||
// return new ShellProcessor("ifdown eth0:" + pacName);
|
||||
return new ShellProcessor("ip addr del "
|
||||
return new CompoundProcessor(new ShellProcessor("ip addr del "
|
||||
+ pac.getCurINetAddr().getInetAddr()
|
||||
+ "/32 dev eth0 label eth0:"
|
||||
+ "/32 dev eth0"
|
||||
+ pac.getName()
|
||||
);
|
||||
),
|
||||
new ShellProcessor("ip addr add "
|
||||
+ pac.getCurINet6Addr().getInetAddr()
|
||||
+ "/128 dev eth0 noprefixroute preferred_lft 0"
|
||||
+ pac.getName()
|
||||
));
|
||||
}
|
||||
|
||||
private UnixUser getPacAdminUser(Pac pac) throws ProcessorException {
|
||||
|
||||
@ -3,17 +3,18 @@
|
||||
# Do not edit manually. Changes will be overwritten.
|
||||
#
|
||||
|
||||
127.0.0.1 localhost
|
||||
127.0.0.1 localhost
|
||||
::1 ip6-localhost ip6-loopback
|
||||
fe00::0 ip6-localnet
|
||||
ff00::0 ip6-mcastprefix
|
||||
ff02::1 ip6-allnodes
|
||||
ff02::2 ip6-allrouters
|
||||
ff02::3 ip6-allhosts
|
||||
|
||||
::1 ip6-localhost ip6-loopback
|
||||
fe00::0 ip6-localnet
|
||||
ff00::0 ip6-mcastprefix
|
||||
ff02::1 ip6-allnodes
|
||||
ff02::2 ip6-allrouters
|
||||
ff02::3 ip6-allhosts
|
||||
|
||||
${hive.inetAddr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
|
||||
${hive.inetAddr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
|
||||
${hive.inet6Addr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
|
||||
|
||||
#foreach( $pac in ${hive.webpacs} )
|
||||
${pac.curINetAddr.inetAddr} ${pac.name}.hostsharing.net ${pac.name}
|
||||
${pac.curINetAddr.inetAddr} ${pac.name}.hostsharing.net ${pac.name}
|
||||
${pac.curINet6Addr.inetAddr} ${pac.name}.hostsharing.net ${pac.name}
|
||||
#end
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
#foreach( $pac in ${hive.webpacs} )
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:80>
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:80 ${pac.curINet6Addr.inetAddr}:80>
|
||||
ServerName _
|
||||
ServerAdmin webmaster@${pac.name}.hostsharing.net
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:443>
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}:443 ${pac.curINet6Addr.inetAddr}:443>
|
||||
ServerName _
|
||||
ServerAdmin webmaster@${pac.name}.hostsharing.net
|
||||
|
||||
|
||||
8
hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv6.vm
Normal file
8
hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv6.vm
Normal file
@ -0,0 +1,8 @@
|
||||
#
|
||||
# This file is managed by HSAdmin.
|
||||
# Do not edit manually. Changes will be overwritten.
|
||||
#
|
||||
#
|
||||
#foreach( $pac in ${hive.webpacs} )
|
||||
eth0:${pac.name}:${pac.curINet6Addr.inetAddr}/128
|
||||
#end
|
||||
@ -4,18 +4,16 @@
|
||||
#
|
||||
|
||||
#foreach( $pac in ${hive.webpacs} )
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr}>
|
||||
<VirtualHost ${pac.curINetAddr.inetAddr} ${pac.curINet6Addr.inetAddr}>
|
||||
DefaultRoot ~ ${pac.name}
|
||||
ServerName "${pac.name}.hostsharing.net"
|
||||
AllowOverwrite on
|
||||
AllowForeignAddress on
|
||||
|
||||
<Limit LOGIN>
|
||||
Order allow,deny
|
||||
AllowGroup ${pac.name}
|
||||
DenyAll
|
||||
</Limit>
|
||||
|
||||
<Anonymous /home/pacs/${pac.name}/ftp>
|
||||
User ${pac.name}
|
||||
Group ${pac.name}
|
||||
@ -25,13 +23,10 @@
|
||||
DirFakeGroup on ftp
|
||||
DirFakeMode 000
|
||||
AuthAliasOnly on
|
||||
|
||||
<Limit WRITE>
|
||||
DenyAll
|
||||
</Limit>
|
||||
|
||||
</Anonymous>
|
||||
</VirtualHost>
|
||||
|
||||
#end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user