some enhancements, v. 4.0.7
This commit is contained in:
parent
01f7217878
commit
be5a785368
@ -1,7 +1,8 @@
|
|||||||
DROP TABLE pricelist_ref ;
|
DROP TABLE pricelist_ref ;
|
||||||
DROP TABLE price ;
|
DROP TABLE price ;
|
||||||
DROP TABLE price_list CASCADE ;
|
DROP TABLE price_list CASCADE ;
|
||||||
-- DROP VIEW business_partner_ticket ;
|
DROP VIEW IF EXISTS business_partner_ticket ;
|
||||||
|
DROP VIEW IF EXISTS ipconfig ;
|
||||||
DROP TABLE sepa_mandat ;
|
DROP TABLE sepa_mandat ;
|
||||||
DROP SEQUENCE sepa_mandat_id_seq ;
|
DROP SEQUENCE sepa_mandat_id_seq ;
|
||||||
DROP SEQUENCE contact_contact_id_seq ;
|
DROP SEQUENCE contact_contact_id_seq ;
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<groupId>de.hsadmin</groupId>
|
<groupId>de.hsadmin</groupId>
|
||||||
<artifactId>hsar</artifactId>
|
<artifactId>hsar</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
<name>HSAdmin Stable Backend Webapp</name>
|
<name>HSAdmin Stable Backend Webapp</name>
|
||||||
<url>http://maven.apache.org</url>
|
<url>http://maven.apache.org</url>
|
||||||
<properties>
|
<properties>
|
||||||
@ -36,12 +36,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.hsadmin.core</groupId>
|
<groupId>de.hsadmin.core</groupId>
|
||||||
<artifactId>hsadmin-util</artifactId>
|
<artifactId>hsadmin-util</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.hsadmin.core</groupId>
|
<groupId>de.hsadmin.core</groupId>
|
||||||
<artifactId>hsadmin-qserv</artifactId>
|
<artifactId>hsadmin-qserv</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-httpclient</groupId>
|
<groupId>commons-httpclient</groupId>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>de.hsadmin</groupId>
|
<groupId>de.hsadmin</groupId>
|
||||||
<artifactId>hsadmin-qserv</artifactId>
|
<artifactId>hsadmin-qserv</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>HSAdmin-QServ</name>
|
<name>HSAdmin-QServ</name>
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.hsadmin.core</groupId>
|
<groupId>de.hsadmin.core</groupId>
|
||||||
<artifactId>hsadmin-qserv</artifactId>
|
<artifactId>hsadmin-qserv</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.activemq</groupId>
|
<groupId>org.apache.activemq</groupId>
|
||||||
@ -109,6 +109,15 @@
|
|||||||
<filemode>640</filemode>
|
<filemode>640</filemode>
|
||||||
</mapper>
|
</mapper>
|
||||||
</data>
|
</data>
|
||||||
|
<data>
|
||||||
|
<src>src/deb/systemd/hsadmin-qserv.service</src>
|
||||||
|
<type>file</type>
|
||||||
|
<mapper>
|
||||||
|
<type>perm</type>
|
||||||
|
<prefix>/lib/systemd/system/</prefix>
|
||||||
|
<filemode>644</filemode>
|
||||||
|
</mapper>
|
||||||
|
</data>
|
||||||
</dataSet>
|
</dataSet>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
|
BIN
qserv-deploy/src/deb/etc/keystore
Normal file
BIN
qserv-deploy/src/deb/etc/keystore
Normal file
Binary file not shown.
@ -11,7 +11,7 @@
|
|||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
# Die Nachrichten in eine Datei im Log-Verzeichnis schreiben
|
# Die Nachrichten in eine Datei im Log-Verzeichnis schreiben
|
||||||
java.util.logging.FileHandler.pattern=hsar-qserv.log
|
java.util.logging.FileHandler.pattern=/var/log/hostsharing/hsadmin/hsar-qserv.log
|
||||||
java.util.logging.FileHandler.limit=500000
|
java.util.logging.FileHandler.limit=500000
|
||||||
java.util.logging.FileHandler.count=5
|
java.util.logging.FileHandler.count=5
|
||||||
java.util.logging.FileHandler.level=ALL
|
java.util.logging.FileHandler.level=ALL
|
||||||
|
@ -2,11 +2,7 @@ hsadmin.jms.factory=QueueCF
|
|||||||
hsadmin.jms.status-queue=hsadminStatus
|
hsadmin.jms.status-queue=hsadminStatus
|
||||||
hsadmin.jms.system-queue=hsadminSystem-h98
|
hsadmin.jms.system-queue=hsadminSystem-h98
|
||||||
hsadmin.jms.username=user-h98
|
hsadmin.jms.username=user-h98
|
||||||
hsadmin.jms.password=****
|
hsadmin.jms.password=acmq
|
||||||
hsadmin.log.config=conf/logging.properties
|
hsadmin.log.config=/etc/hsadmin/qserv/logging.properties
|
||||||
hsadmin.log.email=service@hostsharing.net
|
hsadmin.log.email=service@hostsharing.net
|
||||||
hsadmin.log.from=qserv@h98.hostsharing.net
|
hsadmin.log.from=qserv@h98.hostsharing.net
|
||||||
mysqladmin.user=root
|
|
||||||
mysqladmin.password=****
|
|
||||||
pgsqladmin.user=postgres
|
|
||||||
pgsqladmin.password=****
|
|
||||||
|
17
qserv-deploy/src/deb/systemd/hsadmin-qserv.service
Normal file
17
qserv-deploy/src/deb/systemd/hsadmin-qserv.service
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=HSAdmin Management Queue-Worker Service
|
||||||
|
After=network.target nss-lookup.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
Environment="PATH=/usr/local/bin:/usr/bin:/bin"
|
||||||
|
Environment="JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64"
|
||||||
|
Environment="JAVA_OPTS=-Xbootclasspath/a:/etc/hsadmin/qserv/ -Djavax.net.ssl.keyStore=/etc/hsadmin/qserv/keystore -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=/etc/hsadmin/qserv/keystore -Djavax.net.ssl.trustStorePassword=password -Dorg.apache.activemq.SERIALIZABLE_PACKAGES=java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf,com.thoughtworks.xstream.mapper,de.hsadmin.core.qserv,de.hsadmin.mods.cust,de.hsadmin.mods.db,de.hsadmin.mods.dom,de.hsadmin.mods.email,de.hsadmin.mods.pac,de.hsadmin.mods.qstat,de.hsadmin.mods.user"
|
||||||
|
ExecStart=/usr/bin/java $JAVA_OPTS -jar /usr/local/lib/hostsharing/hsadmin/hsadmin-qserv-full.jar /etc/hsadmin/qserv/qserv.properties
|
||||||
|
StandardOutput=file:/var/log/hostsharing/hsadmin/hsar-qserv.err
|
||||||
|
StandardError=inherit
|
||||||
|
Restart=always
|
||||||
|
PrivateTmp=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>de.hsadmin.core</groupId>
|
<groupId>de.hsadmin.core</groupId>
|
||||||
<artifactId>hsadmin-qserv</artifactId>
|
<artifactId>hsadmin-qserv</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<java.version>11</java.version>
|
<java.version>11</java.version>
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.hsadmin.core</groupId>
|
<groupId>de.hsadmin.core</groupId>
|
||||||
<artifactId>hsadmin-util</artifactId>
|
<artifactId>hsadmin-util</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-lang</groupId>
|
<groupId>commons-lang</groupId>
|
||||||
|
@ -184,9 +184,12 @@ public class QueueServer extends QueueCommons implements MessageListener, Except
|
|||||||
public void onException(JMSException e) {
|
public void onException(JMSException e) {
|
||||||
logger.log(Level.WARNING, e.getMessage(), e);
|
logger.log(Level.WARNING, e.getMessage(), e);
|
||||||
close();
|
close();
|
||||||
|
try {
|
||||||
|
Thread.sleep(10 * 1000L);
|
||||||
|
} catch (InterruptedException e1) { }
|
||||||
while (!connect()) {
|
while (!connect()) {
|
||||||
try {
|
try {
|
||||||
Thread.sleep(10000);
|
Thread.sleep(120 * 1000L);
|
||||||
} catch (InterruptedException e1) { }
|
} catch (InterruptedException e1) { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>de.hsadmin.core</groupId>
|
<groupId>de.hsadmin.core</groupId>
|
||||||
<artifactId>hsadmin-util</artifactId>
|
<artifactId>hsadmin-util</artifactId>
|
||||||
<version>4.0.6</version>
|
<version>4.0.7</version>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<java.version>11</java.version>
|
<java.version>11</java.version>
|
||||||
|
@ -23,10 +23,10 @@ public class Config {
|
|||||||
file = new File(System.getProperty("user.home") + "/.hsadmin.properties");
|
file = new File(System.getProperty("user.home") + "/.hsadmin.properties");
|
||||||
}
|
}
|
||||||
if (!file.canRead()) {
|
if (!file.canRead()) {
|
||||||
file = new File("/etc/hsadmin.properties");
|
file = new File("/etc/hsadmin/hsadmin.properties");
|
||||||
}
|
}
|
||||||
if (!file.canRead()) {
|
if (!file.canRead()) {
|
||||||
file = new File("/etc/hsadmin/hsadmin.properties");
|
file = new File("/etc/hsadmin.properties");
|
||||||
}
|
}
|
||||||
if (file.canRead()) {
|
if (file.canRead()) {
|
||||||
try {
|
try {
|
||||||
|
Loading…
Reference in New Issue
Block a user