diff --git a/hsarback/database/dropschema.sql b/hsarback/database/dropschema.sql
index 1e001ee..352c2eb 100644
--- a/hsarback/database/dropschema.sql
+++ b/hsarback/database/dropschema.sql
@@ -1,7 +1,8 @@
DROP TABLE pricelist_ref ;
DROP TABLE price ;
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 SEQUENCE sepa_mandat_id_seq ;
DROP SEQUENCE contact_contact_id_seq ;
diff --git a/hsarback/pom.xml b/hsarback/pom.xml
index 6f4ac05..eecfe62 100644
--- a/hsarback/pom.xml
+++ b/hsarback/pom.xml
@@ -5,7 +5,7 @@
de.hsadmin
hsar
war
- 4.0.6
+ 4.0.7
HSAdmin Stable Backend Webapp
http://maven.apache.org
@@ -36,12 +36,12 @@
de.hsadmin.core
hsadmin-util
- 4.0.6
+ 4.0.7
de.hsadmin.core
hsadmin-qserv
- 4.0.6
+ 4.0.7
commons-httpclient
diff --git a/qserv-deploy/pom.xml b/qserv-deploy/pom.xml
index 0182bbc..bd7efe5 100644
--- a/qserv-deploy/pom.xml
+++ b/qserv-deploy/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.hsadmin
hsadmin-qserv
- 4.0.6
+ 4.0.7
jar
HSAdmin-QServ
@@ -13,7 +13,7 @@
de.hsadmin.core
hsadmin-qserv
- 4.0.6
+ 4.0.7
org.apache.activemq
@@ -109,6 +109,15 @@
640
+
+ src/deb/systemd/hsadmin-qserv.service
+ file
+
+ perm
+ /lib/systemd/system/
+ 644
+
+
diff --git a/qserv-deploy/src/deb/etc/keystore b/qserv-deploy/src/deb/etc/keystore
new file mode 100644
index 0000000..dff26bc
Binary files /dev/null and b/qserv-deploy/src/deb/etc/keystore differ
diff --git a/qserv-deploy/src/deb/etc/logging.properties b/qserv-deploy/src/deb/etc/logging.properties
index 9dc46b8..c1ad1c0 100644
--- a/qserv-deploy/src/deb/etc/logging.properties
+++ b/qserv-deploy/src/deb/etc/logging.properties
@@ -11,7 +11,7 @@
############################################################
# 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.count=5
java.util.logging.FileHandler.level=ALL
diff --git a/qserv-deploy/src/deb/etc/qserv.properties b/qserv-deploy/src/deb/etc/qserv.properties
index 3cfa6a2..84a097e 100644
--- a/qserv-deploy/src/deb/etc/qserv.properties
+++ b/qserv-deploy/src/deb/etc/qserv.properties
@@ -2,11 +2,7 @@ hsadmin.jms.factory=QueueCF
hsadmin.jms.status-queue=hsadminStatus
hsadmin.jms.system-queue=hsadminSystem-h98
hsadmin.jms.username=user-h98
-hsadmin.jms.password=****
-hsadmin.log.config=conf/logging.properties
+hsadmin.jms.password=acmq
+hsadmin.log.config=/etc/hsadmin/qserv/logging.properties
hsadmin.log.email=service@hostsharing.net
-hsadmin.log.from=qserv@h98.hostsharing.net
-mysqladmin.user=root
-mysqladmin.password=****
-pgsqladmin.user=postgres
-pgsqladmin.password=****
+hsadmin.log.from=qserv@h98.hostsharing.net
\ No newline at end of file
diff --git a/qserv-deploy/src/deb/systemd/hsadmin-qserv.service b/qserv-deploy/src/deb/systemd/hsadmin-qserv.service
new file mode 100644
index 0000000..9eb40b1
--- /dev/null
+++ b/qserv-deploy/src/deb/systemd/hsadmin-qserv.service
@@ -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
diff --git a/qserv/pom.xml b/qserv/pom.xml
index 6fe490a..9c736d3 100644
--- a/qserv/pom.xml
+++ b/qserv/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.hsadmin.core
hsadmin-qserv
- 4.0.6
+ 4.0.7
UTF-8
11
@@ -13,7 +13,7 @@
de.hsadmin.core
hsadmin-util
- 4.0.6
+ 4.0.7
commons-lang
diff --git a/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java b/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java
index 76b0157..a42c69e 100644
--- a/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java
+++ b/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java
@@ -184,9 +184,12 @@ public class QueueServer extends QueueCommons implements MessageListener, Except
public void onException(JMSException e) {
logger.log(Level.WARNING, e.getMessage(), e);
close();
+ try {
+ Thread.sleep(10 * 1000L);
+ } catch (InterruptedException e1) { }
while (!connect()) {
try {
- Thread.sleep(10000);
+ Thread.sleep(120 * 1000L);
} catch (InterruptedException e1) { }
}
}
diff --git a/util/pom.xml b/util/pom.xml
index 69896bd..bfbe072 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.hsadmin.core
hsadmin-util
- 4.0.6
+ 4.0.7
UTF-8
11
diff --git a/util/src/main/java/de/hsadmin/core/util/Config.java b/util/src/main/java/de/hsadmin/core/util/Config.java
index 2d713a4..30e58bf 100644
--- a/util/src/main/java/de/hsadmin/core/util/Config.java
+++ b/util/src/main/java/de/hsadmin/core/util/Config.java
@@ -23,10 +23,10 @@ public class Config {
file = new File(System.getProperty("user.home") + "/.hsadmin.properties");
}
if (!file.canRead()) {
- file = new File("/etc/hsadmin.properties");
+ file = new File("/etc/hsadmin/hsadmin.properties");
}
if (!file.canRead()) {
- file = new File("/etc/hsadmin/hsadmin.properties");
+ file = new File("/etc/hsadmin.properties");
}
if (file.canRead()) {
try {