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

Merge branch 'master' of ssh://dev.hostsharing.net:29418/hsadmin/hs.hsadmin

Browse Source
This commit is contained in:
Michael Hierweck 2017-06-29 14:02:59 +02:00
commit b585f9b9f4
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hsarback/src/de/hsadmin/mods/dom/Domain.java
View File

@ -196,8 +196,11 @@ public class Domain extends AbstractEntity {
StringBuffer aliases = new StringBuffer();
for (String sub : subs) {
aliases.append(' ');
aliases.append(sub.trim());
final String trimmed = sub.trim();
if (trimmed != null && !trimmed.isEmpty()) {
aliases.append(trimmed);
aliases.append('.');
}
aliases.append(name);
}
return aliases.toString();

12
hsarback/src/de/hsadmin/mods/pac/Hive.java
View File

@ -6,6 +6,8 @@ import static javax.persistence.FetchType.LAZY;
import static javax.persistence.GenerationType.SEQUENCE;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.persistence.Column;
@ -118,6 +120,16 @@ public class Hive extends AbstractEntity implements Serializable {
return pacs;
}
public List<Pac> getWebpacs() {
final ArrayList<Pac> webpacs = new ArrayList<Pac>();
for (final Pac pac : pacs) {
if (!pac.isManagedServer()) {
webpacs.add(pac);
}
}
return webpacs;
}
public void setPacs(Set<Pac> pacs) {
this.pacs = pacs;
}

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

@ -14,6 +14,6 @@ ff02::3 ip6-allhosts
${hive.inetAddr.inetAddr} ${hive.name}.hostsharing.net ${hive.name} localhive
#foreach( $pac in ${hive.pacs} )
#foreach( $pac in ${hive.webpacs} )
${pac.curINetAddr.inetAddr} ${pac.name}.hostsharing.net ${pac.name}
#end

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

@ -3,10 +3,10 @@
# Do not edit manually. Changes will be overwritten.
#
#foreach( $pac in ${hive.pacs} )
#foreach( $pac in ${hive.webpacs} )
<VirtualHost ${pac.curINetAddr.inetAddr}:80>
ServerName _
ServerAdmin webmaster@${pac.getName}
ServerAdmin webmaster@${pac.getName}.hostsharing.net
<Directory />
Redirect 404 /
@ -16,7 +16,7 @@
<VirtualHost ${pac.curINetAddr.inetAddr}:443>
ServerName _
ServerAdmin webmaster@${pac.getName}
ServerAdmin webmaster@${pac.getName}.hostsharing.net
SSLEngine On
SSLCertificateFile /etc/apache2/pems-enabled/${pac.getName}.crt

4
hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv4.vm
View File

@ -3,8 +3,6 @@
# Do not edit manually. Changes will be overwritten.
#
#
#foreach( $pac in ${hive.pacs} )
#if( !${pac.managedServer} )
#foreach( $pac in ${hive.webpacs} )
eth0:${pac.name}:${pac.curINetAddr.inetAddr}/32
#end
#end

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

@ -3,7 +3,7 @@
# Do not edit manually. Changes will be overwritten.
#
#foreach( $pac in ${hive.pacs} )
#foreach( $pac in ${hive.webpacs} )
<VirtualHost ${pac.curINetAddr.inetAddr}>
DefaultRoot ~ ${pac.name}
ServerName "${pac.name}.hostsharing.net"

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

@ -3,6 +3,6 @@
# Do not edit manually. Changes will be overwritten.
#
#foreach( $pac in ${hive.pacs} )
#foreach( $pac in ${hive.webpacs} )
${pac.name} ALL = (%${pac.name}) NOPASSWD: ALL
#end