Simplified startup script and fixed environment setting in service unit.

DANS-KNAW · Jun 11, 2024 · 41cf471 · 41cf471
1 parent 949c903
commit 41cf471
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/assembly/dist/bin/dd-manage-deposit b/src/main/assembly/dist/bin/dd-manage-deposit
@@ -2,7 +2,6 @@
 
 SCRIPTNAME=$(basename $0)
 BINPATH=$(command readlink -f $0 2> /dev/null || command grealpath $0 2> /dev/null)
-APPHOME=$(dirname  $(dirname $BINPATH))
-CONFIG_PATH=/etc/opt/dans.knaw.nl/$SCRIPTNAME/config.yml
+APPHOME=$(dirname  "$(dirname $BINPATH)")
 
-java $DANS_JAVA_OPTS -Ddans.default.config=$CONFIG_PATH -jar $APPHOME/bin/$SCRIPTNAME.jar "$@"
+java $DANS_JAVA_OPTS $JAVA_OPTS -jar $APPHOME/bin/$SCRIPTNAME.jar "$@"
diff --git a/src/main/assembly/dist/install/dd-manage-deposit.service b/src/main/assembly/dist/install/dd-manage-deposit.service
@@ -5,7 +5,7 @@ Description=Dd Manage Deposit Service
 ExecStart=/opt/dans.knaw.nl/dd-manage-deposit/bin/dd-manage-deposit server /etc/opt/dans.knaw.nl/dd-manage-deposit/config.yml
 # Java returns 143 even if the SIGTERM was handled correctly.
 SuccessExitStatus=143
-Environment="INITIAL_HEAP_SIZE=-Xms64m"
+Environment="JAVA_OPTS=-Xms64m"
 Environment="LC_ALL=en_US.UTF-8"
 
 User=dd-manage-deposit