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

merge IPv6 changes

Browse Source
This commit is contained in:
Michael Hierweck 2019-03-05 21:16:00 +01:00 committed by Peter Hormanns
parent 2019e012ff
commit c09e9bba2e
7 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# Do not edit manually. Changes will be overwritten. # 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} ServerName ${dom.name}
ServerAlias ${dom.serveraliases} ServerAlias ${dom.serveraliases}
ServerAdmin webmaster@${dom.name} ServerAdmin webmaster@${dom.name}
@ -76,7 +76,7 @@
Action application/x-httpd-php /fastcgi-bin/phpstub Action application/x-httpd-php /fastcgi-bin/phpstub
</VirtualHost> </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} ServerName ${dom.name}
ServerAlias ${dom.serveraliases} ServerAlias ${dom.serveraliases}
ServerAdmin webmaster@${dom.name} ServerAdmin webmaster@${dom.name}
@ -124,6 +124,10 @@
Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
</Location> </Location>
#if( ${phplatest} )
FcgidInitialEnv HTTP_PHP_BIN /usr/lib/cgi-bin/php7.3
#end
RewriteEngine On RewriteEngine On
RewriteOptions Inherit RewriteOptions Inherit

34
hsarback/src/de/hsadmin/mods/dom/zonefile.vm
View File

@ -1,24 +1,26 @@
$TTL 6H $TTL 6H
${dom.name}. IN SOA ${dom.dnsMaster}.hostsharing.net. hostmaster.hostsharing.net. ( ${dom.name}. IN SOA ${dom.dnsMaster}.hostsharing.net. hostmaster.hostsharing.net. (
${sio} ; serial secs since Jan 1 1970 ${sio} ; serial secs since Jan 1 1970
6H ; refresh (>=10000) 6H ; refresh (>=10000)
1H ; retry (>=1800) 1H ; retry (>=1800)
1W ; expire 1W ; expire
1H ; minimum 1H ; minimum
) )
${dom.name}. IN NS dns1.hostsharing.net. ${dom.name}. IN NS dns1.hostsharing.net.
${dom.name}. IN NS dns2.hostsharing.net. ${dom.name}. IN NS dns2.hostsharing.net.
${dom.name}. IN NS dns3.hostsharing.net. ${dom.name}. IN NS dns3.hostsharing.net.
${dom.name}. IN MX 30 mailin1.hostsharing.net. ${dom.name}. IN MX 30 mailin1.hostsharing.net.
${dom.name}. IN MX 30 mailin2.hostsharing.net. ${dom.name}. IN MX 30 mailin2.hostsharing.net.
${dom.name}. IN MX 30 mailin3.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 mailin1.hostsharing.net.
*.${dom.name}. IN MX 30 mailin2.hostsharing.net. *.${dom.name}. IN MX 30 mailin2.hostsharing.net.
*.${dom.name}. IN MX 30 mailin3.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}

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

@ -176,21 +176,29 @@ public class PacProcessorFactory implements EntityProcessorFactory {
} }
private Processor createIfUp(final Pac pac) { private Processor createIfUp(final Pac pac) {
// return new ShellProcessor("ifup eth0:" + pacName); return new CompoundProcessor(new ShellProcessor("ip addr add "
return new ShellProcessor("ip addr add "
+ pac.getCurINetAddr().getInetAddr() + pac.getCurINetAddr().getInetAddr()
+ "/32 dev eth0 label eth0:" + "/32 dev eth0"
+ pac.getName() + 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) { private Processor createIfDown(final Pac pac) {
// return new ShellProcessor("ifdown eth0:" + pacName); return new CompoundProcessor(new ShellProcessor("ip addr del "
return new ShellProcessor("ip addr del "
+ pac.getCurINetAddr().getInetAddr() + pac.getCurINetAddr().getInetAddr()
+ "/32 dev eth0 label eth0:" + "/32 dev eth0"
+ pac.getName() + 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 { private UnixUser getPacAdminUser(Pac pac) throws ProcessorException {

21
hsarback/src/de/hsadmin/mods/pac/hosts.vm
View File

@ -3,17 +3,18 @@
# Do not edit manually. Changes will be overwritten. # 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 ${hive.inetAddr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
fe00::0 ip6-localnet ${hive.inet6Addr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
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
#foreach( $pac in ${hive.webpacs} ) #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 #end

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

@ -4,7 +4,7 @@
# #
#foreach( $pac in ${hive.webpacs} ) #foreach( $pac in ${hive.webpacs} )
<VirtualHost ${pac.curINetAddr.inetAddr}:80> <VirtualHost ${pac.curINetAddr.inetAddr}:80 ${pac.curINet6Addr.inetAddr}:80>
ServerName _ ServerName _
ServerAdmin webmaster@${pac.name}.hostsharing.net ServerAdmin webmaster@${pac.name}.hostsharing.net
@ -15,7 +15,7 @@
</VirtualHost> </VirtualHost>
<VirtualHost ${pac.curINetAddr.inetAddr}:443> <VirtualHost ${pac.curINetAddr.inetAddr}:443 ${pac.curINet6Addr.inetAddr}:443>
ServerName _ ServerName _
ServerAdmin webmaster@${pac.name}.hostsharing.net ServerAdmin webmaster@${pac.name}.hostsharing.net

8
hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv6.vm Normal file
View 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

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

@ -4,18 +4,16 @@
# #
#foreach( $pac in ${hive.webpacs} ) #foreach( $pac in ${hive.webpacs} )
<VirtualHost ${pac.curINetAddr.inetAddr}> <VirtualHost ${pac.curINetAddr.inetAddr} ${pac.curINet6Addr.inetAddr}>
DefaultRoot ~ ${pac.name} DefaultRoot ~ ${pac.name}
ServerName "${pac.name}.hostsharing.net" ServerName "${pac.name}.hostsharing.net"
AllowOverwrite on AllowOverwrite on
AllowForeignAddress on AllowForeignAddress on
<Limit LOGIN> <Limit LOGIN>
Order allow,deny Order allow,deny
AllowGroup ${pac.name} AllowGroup ${pac.name}
DenyAll DenyAll
</Limit> </Limit>
<Anonymous /home/pacs/${pac.name}/ftp> <Anonymous /home/pacs/${pac.name}/ftp>
User ${pac.name} User ${pac.name}
Group ${pac.name} Group ${pac.name}
@ -25,13 +23,10 @@
DirFakeGroup on ftp DirFakeGroup on ftp
DirFakeMode 000 DirFakeMode 000
AuthAliasOnly on AuthAliasOnly on
<Limit WRITE> <Limit WRITE>
DenyAll DenyAll
</Limit> </Limit>
</Anonymous> </Anonymous>
</VirtualHost> </VirtualHost>
#end #end