From cb7820de5e973d74206bdd002a1efd7abaf0149d Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Fri, 23 Jun 2023 18:43:38 +0200
Subject: [PATCH] adjust hsadmin-qserv deb

---
 qserv-deploy/pom.xml              | 22 ++--------------------
 qserv-deploy/src/deb/bin/qserv.sh |  3 ---
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100755 qserv-deploy/src/deb/bin/qserv.sh

diff --git a/qserv-deploy/pom.xml b/qserv-deploy/pom.xml
index f2c01c8..ebff0cf 100644
--- a/qserv-deploy/pom.xml
+++ b/qserv-deploy/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hsadmin</groupId>
 	<artifactId>hsadmin-qserv</artifactId>
-	<version>4.0.7</version>
+	<version>4.0.8</version>
 	<packaging>jar</packaging>
 
 	<name>HSAdmin-QServ</name>
@@ -80,24 +80,6 @@
 								<prefix>/usr/local/lib/hostsharing/hsadmin</prefix>
 							</mapper>
 						</data>
-						<data>
-							<src>src/deb/bin/qserv.sh</src>
-							<type>file</type>
-							<mapper>
-								<type>perm</type>
-								<prefix>/usr/local/sbin</prefix>
-								<filemode>744</filemode>
-							</mapper>
-						</data>
-						<data>
-							<src>src/deb/etc/jndi.properties</src>
-							<type>file</type>
-							<mapper>
-								<type>perm</type>
-								<prefix>/etc/hsadmin/qserv</prefix>
-								<filemode>640</filemode>
-							</mapper>
-						</data>
 						<data>
 							<src>src/deb/etc/logging.properties</src>
 							<type>file</type>
@@ -108,7 +90,7 @@
 							</mapper>
 						</data>
 						<data>
-							<src>src/deb/etc/qserv.properties</src>
+							<src>src/deb/etc/keystore</src>
 							<type>file</type>
 							<mapper>
 								<type>perm</type>
diff --git a/qserv-deploy/src/deb/bin/qserv.sh b/qserv-deploy/src/deb/bin/qserv.sh
deleted file mode 100755
index 94d7461..0000000
--- a/qserv-deploy/src/deb/bin/qserv.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-JAVA_OPTS="-Xbootclasspath/a:/etc/hsadmin/qserv/"
-/usr/bin/java $JAVA_OPTS -jar /usr/local/lib/hostsharing/hsadmin/hsadmin-qserv-full.jar /etc/hsadmin/qserv/qserv.properties
\ No newline at end of file