From c15dd0301e89e0f2208d29a07314394f5f31506f Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Wed, 2 May 2018 07:41:42 +0200
Subject: [PATCH] SSDM-6559: remove redundant keystore copy in install.sh and
remove redundant trustStore system property in openbis.conf
---
openbis/dist/server/install.sh | 1 -
openbis/dist/server/openbis.conf | 2 +-
.../dist/server/openbis.conf | 18 ------------------
3 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 openbis_standard_technologies/dist/server/openbis.conf
diff --git a/openbis/dist/server/install.sh b/openbis/dist/server/install.sh
index 2e3b998a482..7a7e3852a0e 100755
--- a/openbis/dist/server/install.sh
+++ b/openbis/dist/server/install.sh
@@ -87,7 +87,6 @@ mkdir -p "$JETTY_ETC_DIR"
test -f "$installation_folder/web-client.properties" && cp -p "$installation_folder/web-client.properties" "$JETTY_ETC_DIR"
test -f "$JETTY_ETC_DIR/keystore" && rm "$JETTY_ETC_DIR/keystore"
cp -p "$installation_folder/openBIS.keystore" "$JETTY_ETC_DIR"
-cp -p "$installation_folder/openBIS.keystore" "$JETTY_ETC_DIR"/keystore
cp -p $startup_properties_file "$JETTY_ETC_DIR"
diff --git a/openbis/dist/server/openbis.conf b/openbis/dist/server/openbis.conf
index d0da004de6b..65b74bf1c81 100644
--- a/openbis/dist/server/openbis.conf
+++ b/openbis/dist/server/openbis.conf
@@ -10,7 +10,7 @@
#
# General options to the JRE
#
-JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keystore}
+JAVA_OPTS=${JAVA_OPTS:=-server -d64}
#
# Memory options to the JRE
diff --git a/openbis_standard_technologies/dist/server/openbis.conf b/openbis_standard_technologies/dist/server/openbis.conf
deleted file mode 100644
index 6c5055b8023..00000000000
--- a/openbis_standard_technologies/dist/server/openbis.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# openBIS configuration file
-#
-
-#
-# Home directory of the JRE that should be used
-#
-#JAVA_HOME=${JAVA_HOME:=/usr/java/latest}
-
-#
-# General options to the JRE
-#
-JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keystore}
-
-#
-# Memory options to the JRE
-#
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m"
--
GitLab