Removed environment overrides where redundant (for vault services)

DANS-KNAW · Jun 10, 2024 · 6270afd · 6270afd
1 parent 987ea0d
commit 6270afd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/src/main/assembly/dist/install/charset.conf b/src/main/assembly/dist/install/charset.conf
diff --git a/src/main/assembly/dist/install/dd-dataverse-authenticator.service b/src/main/assembly/dist/install/dd-dataverse-authenticator.service
@@ -5,6 +5,8 @@ Description=Dd Dataverse Authenticator Service
 ExecStart=/opt/dans.knaw.nl/dd-dataverse-authenticator/bin/dd-dataverse-authenticator server /etc/opt/dans.knaw.nl/dd-dataverse-authenticator/config.yml
 # Java returns 143 even if the SIGTERM was handled correctly.
 SuccessExitStatus=143
+Environment="INITIAL_HEAP_SIZE=-Xms64m"
+Environment="LC_ALL=en_US.UTF-8"
 
 User=dd-dataverse-authenticator
 Group=dd-dataverse-authenticator

diff --git a/src/main/assembly/dist/install/memusage.conf b/src/main/assembly/dist/install/memusage.conf
diff --git a/src/main/rpm/2-post-install.sh b/src/main/rpm/2-post-install.sh
@@ -23,8 +23,7 @@ INSTALL_DIR=/opt/dans.knaw.nl/$MODULE_NAME
 PHASE="POST-INSTALL"
 
 echo "$PHASE: START (Number of current installations: $NUMBER_OF_INSTALLATIONS)"
-service_install_systemd_unit "$INSTALL_DIR/install/$MODULE_NAME.service" $MODULE_NAME "$INSTALL_DIR/install/charset.conf"
-service_install_systemd_unit "$INSTALL_DIR/install/$MODULE_NAME.service" $MODULE_NAME "$INSTALL_DIR/install/memusage.conf"
+service_install_systemd_unit "$INSTALL_DIR/install/$MODULE_NAME.service" $MODULE_NAME 
 
 service_create_log_directory $MODULE_NAME
 echo "$PHASE: DONE"