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

New domain options and properties for Debian Bookworm #1

Closed
hsh-timotheuspokorra wants to merge 41 commits from TP-202311-vhost-bookworm into rel_4.0
pull from: TP-202311-vhost-bookworm
merge into: hostsharing:rel_4.0
Conversation 1 Commits 41 Files Changed 20 +26 -12
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 006eef9ab5 - Show all commits

14
qserv/hsadmin.properties Normal file
View File

@ -0,0 +1,14 @@
hsadmin.jms.url=ssl://hsh02.hostsharing.net:61619
hsadmin.jms.username=user-h98
hsadmin.jms.password=Duoqu4chae8oofahgei9SouK
hsadmin.jms.system-queue=queue.hsadminSystem-h98
hsadmin.jms.status-queue=queue.hsadminStatus
accountprefix.customer=hsh00
accountprefix.hostmaster=hsh01
queues.dns=testdns
queues.mail=testmail
hsadmin.smtp.from=peter.hormanns@hostsharing.net
hsadmin.smtp.cc=peter.hormanns@hostsharing.net
loginURL=TestUmgebung
backendURL=https://config.hostsharing.net:443/hsar/backend
xmlrpcURL=http://localhost:8080/hsar/xmlrpc/hsadmin

24
qserv/src/main/java/de/hsadmin/mods/dom/Domain.java
View File

@ -55,6 +55,10 @@ public class Domain extends AbstractEntity {
@Column(name = "domain_dns_master", columnDefinition = "character varying(64)")
private String dnsMaster;
@AnnFieldIO(validation="([a-z0-9\\-]+\\,)*[a-z0-9\\-]+|\\*|", rw=ReadWriteAccess.READWRITE)
@Column(name = "valid_subdomain_names", columnDefinition = "character varying(512)")
private String validsubdomainnames;
@AnnFieldIO(validation="[a-zA-Z0-9\\-\\.]*", rw=ReadWriteAccess.READWRITE, referTo=DomainOption.class, selectableValues=DomainOptionValues.class)
@ManyToMany(fetch=FetchType.EAGER, cascade=CascadeType.PERSIST)
@JoinTable(name="domain__domain_option",
@ -62,10 +66,6 @@ public class Domain extends AbstractEntity {
inverseJoinColumns={@JoinColumn(name="domain_option_id", referencedColumnName="domain_option_id")})
private Set<DomainOption> domainoptions;
@AnnFieldIO(validation="([a-z0-9\\-]+\\,)*[a-z0-9\\-]+|\\*|", rw=ReadWriteAccess.READWRITE)
@Column(name = "valid_subdomain_names", columnDefinition = "character varying(512)")
private String validsubdomainnames;
@AnnFieldIO(validation="[a-zA-Z0-9\\-\\/\\.]*", rw=ReadWriteAccess.READWRITE)
@Column(name = "passenger_python", columnDefinition = "character varying(256)")
private String passengerpython;
@ -191,14 +191,6 @@ public class Domain extends AbstractEntity {
"obj.user=:loginUser";
}
public Set<DomainOption> getDomainoptions() {
return domainoptions;
}
public void setDomainoptions(Set<DomainOption> domainOptions) {
this.domainoptions = domainOptions;
}
public String getValidsubdomainnames() {
return validsubdomainnames;
}
@ -207,6 +199,14 @@ public class Domain extends AbstractEntity {
this.validsubdomainnames = validSubdomainNames;
}
public Set<DomainOption> getDomainoptions() {
return domainoptions;
}
public void setDomainoptions(Set<DomainOption> domainOptions) {
this.domainoptions = domainOptions;
}
public String getPassengerpython() {
return passengerpython;
}