Compare commits

...

2 Commits

Author SHA1 Message Date
Peter Hormanns
18a68db9eb align versions 2023-12-19 18:40:06 +01:00
Peter Hormanns
673c3ce918 add new domain properties 2023-12-19 18:39:37 +01:00
11 changed files with 42 additions and 17 deletions

View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<version>1.0.3</version> <version>1.0.4</version>
</parent> </parent>
<artifactId>cust-webapp</artifactId> <artifactId>cust-webapp</artifactId>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<version>1.0.3</version> <version>1.0.4</version>
</parent> </parent>
<artifactId>database-webapp</artifactId> <artifactId>database-webapp</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<version>1.0.3</version> <version>1.0.4</version>
</parent> </parent>
<artifactId>db-migration</artifactId> <artifactId>db-migration</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
@ -42,4 +42,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<version>1.0.3</version> <version>1.0.4</version>
</parent> </parent>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<version>1.0.3</version> <version>1.0.4</version>
</parent> </parent>
<artifactId>ldap-webapp</artifactId> <artifactId>ldap-webapp</artifactId>

13
pom.xml
View File

@ -6,20 +6,21 @@
<groupId>de.hsadmin</groupId> <groupId>de.hsadmin</groupId>
<artifactId>hsadmin-parent</artifactId> <artifactId>hsadmin-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.3</version> <version>1.0.4</version>
<name>HSAdmin Parent Project</name> <name>HSAdmin Parent Project</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hsadmin.version>1.0.3</hsadmin.version> <hsadmin.version>1.0.4</hsadmin.version>
<tomee.version>8.0.8</tomee.version> <tomee.version>8.0.8</tomee.version>
<servlet.version>4.0.1</servlet.version> <servlet.version>4.0.1</servlet.version>
<liquibase.version>4.4.3</liquibase.version> <liquibase.version>4.17.2</liquibase.version>
<openjpa.version>3.2.0</openjpa.version> <openjpa.version>3.2.2</openjpa.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<xmlrpc.version>3.1.3</xmlrpc.version> <xmlrpc.version>3.1.3</xmlrpc.version>
<bval.version>2.0.5</bval.version> <bval.version>2.0.6</bval.version>
<postgresql.lib>org.postgresql:postgresql:42.2.18</postgresql.lib> <vaadin.version>8.21.0</vaadin.version>
<postgresql.lib>org.postgresql:postgresql:42.2.25</postgresql.lib>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
</properties> </properties>

View File

@ -1,5 +1,5 @@
backendURL=https://config.hostsharing.net:443/hsar/backend backendURL=https://config.hostsharing.net:443/hsar/backend
xmlrpcURL=https://config.hostsharing.net:443/hsar/xmlrpc/hsadmin xmlrpcURL=https://config-test.hostsharing.net:443/hsar/xmlrpc/hsadmin
loginURL=https://login.hostsharing.net:443/cas/v1/tickets loginURL=https://login.hostsharing.net:443/cas/v1/tickets
;xmlrpcURL=http://localhost:8080/cust-webapp/xmlrpc/hsadmin ;xmlrpcURL=http://localhost:8080/cust-webapp/xmlrpc/hsadmin
;loginURL=TestUmgebung ;loginURL=TestUmgebung

View File

@ -21,14 +21,18 @@ public class DomainOptionsEditor extends CustomComponent implements IHSEditor {
private static final String[] OPTIONS = private static final String[] OPTIONS =
new String[] { new String[] {
"greylisting", "greylisting",
"autoconfig",
"dkim",
"backupmxforexternalmx",
"multiviews", "multiviews",
"indexes", "indexes",
"htdocsfallback", "htdocsfallback",
"includes", "includes",
"backupmxforexternalmx",
"letsencrypt", "letsencrypt",
"autoconfig", "cgi",
"dkim" "fastcgi",
"passenger",
"passengerfriendlyerrorpages"
}; };
private final PropertyInfo propertyInfo; private final PropertyInfo propertyInfo;

View File

@ -35,6 +35,10 @@ domain.since=Domain since
domain.dnsMaster=DNS master domain.dnsMaster=DNS master
domain.domainoptions=Domain options domain.domainoptions=Domain options
domain.validsubdomainnames=valid subdomain names domain.validsubdomainnames=valid subdomain names
domain.passengerpython=path to python3-binary (passenger)
domain.passengernodejs=path to node-binary (passenger)
domain.passengerruby=path to ruby-binary (passenger)
domain.fcgiphpbin=path to php-binary (fastcgi)
domainoption.greylisting=greylisting domainoption.greylisting=greylisting
domainoption.multiviews=multiviews domainoption.multiviews=multiviews
domainoption.indexes=indexes domainoption.indexes=indexes
@ -43,7 +47,11 @@ domainoption.includes=includes
domainoption.backupmxforexternalmx=backupmxforexternalmx domainoption.backupmxforexternalmx=backupmxforexternalmx
domainoption.letsencrypt=letsencrypt domainoption.letsencrypt=letsencrypt
domainoption.autoconfig=email autoconfig and autodiscover domainoption.autoconfig=email autoconfig and autodiscover
domainoption.dkim=domain key - dkim domainoption.dkim=domain key - dkim
domainoption.cgi=enable CGI
domainoption.fastcgi=enable FastCGI
domainoption.passenger=enable passenger module
domainoption.passengerfriendlyerrorpages=enable passenger error page
mysqluser.name=MySql username mysqluser.name=MySql username
mysqluser.instance=MySql instance mysqluser.instance=MySql instance
mysqluser.pac=MySql package mysqluser.pac=MySql package

View File

@ -35,6 +35,10 @@ domain.since=eingerichtet am
domain.dnsMaster=DNS Server domain.dnsMaster=DNS Server
domain.domainoptions=Domain-Optionen domain.domainoptions=Domain-Optionen
domain.validsubdomainnames=gültige Subdomains (oder * für Wildcard) domain.validsubdomainnames=gültige Subdomains (oder * für Wildcard)
domain.passengerpython=Pfad zum Python3-Binary (Passenger)
domain.passengernodejs=Pfad zum Node-Binary (Passenger)
domain.passengerruby=Pfad zum Ruby-Binary (Passenger)
domain.fcgiphpbin=Pfad zum PHP-Binary (Fast-CGI)
domainoption.greylisting=Greylisting domainoption.greylisting=Greylisting
domainoption.multiviews=Multiviews domainoption.multiviews=Multiviews
domainoption.indexes=Indexes domainoption.indexes=Indexes
@ -44,6 +48,10 @@ domainoption.backupmxforexternalmx=Backup-MX f
domainoption.letsencrypt=Let's Encrypt-Zertifikat domainoption.letsencrypt=Let's Encrypt-Zertifikat
domainoption.autoconfig=E-Mail Auto-Konfiguration domainoption.autoconfig=E-Mail Auto-Konfiguration
domainoption.dkim=Domain Key - DKIM domainoption.dkim=Domain Key - DKIM
domainoption.cgi=CGI-Funktion aktiv
domainoption.fastcgi=FastCGI-Funltion aktiv
domainoption.passenger=Passenger-Modul aktiv
domainoption.passengerfriendlyerrorpages=Passenger Debug-Modus aktiv
mysqluser.name=MySQL-Benutzer mysqluser.name=MySQL-Benutzer
mysqluser.instance=Datenbanksystem mysqluser.instance=Datenbanksystem
mysqluser.pac=Web-Paket mysqluser.pac=Web-Paket

View File

@ -31,6 +31,10 @@ domain.user=Usuario de dominio
domain.since=Dominio desde domain.since=Dominio desde
domain.dnsMaster=Maestro DNS domain.dnsMaster=Maestro DNS
domain.domainoptions=Opciones de dominio domain.domainoptions=Opciones de dominio
domain.passengerpython=path to python3-binary (passenger)
domain.passengernodejs=path to node-binary (passenger)
domain.passengerruby=path to ruby-binary (passenger)
domain.fcgiphpbin=path to php-binary (fastcgi)
domainoption.greylisting=greylisting domainoption.greylisting=greylisting
domainoption.multiviews=multiviews domainoption.multiviews=multiviews
domainoption.indexes=indexes domainoption.indexes=indexes