Skip to content

Remove Java version from service files templates #1396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-tchad wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+3 −3
Open

Remove Java version from service files templates #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/configs/webapps/embedded/install_service.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set LABKEY_HOME=C:\labkey\labkey
set LABKEY_APPS=C:\labkey\apps
set JAVA_HOME=%LABKEY_APPS%\java\jdk-17.0.9+9
set JAVA_HOME=%LABKEY_APPS%\java\jdk-version

prunsrv.exe //IS//labkeyServer ^
--DisplayName "LabKey Server - labkeyServer" ^
Expand Down
4 changes: 2 additions & 2 deletions server/configs/webapps/embedded/labkey_server.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Systemd unit file for labkey_server.
# This default will require customization. Confirm or edit the LABKEY_HOME path.
# This default will require customization. Update LABKEY_HOME and JAVA_HOME to match the deployment.
# You must always edit the ExecStart line to start with the full path to java.
# <JAVA_HOME> is shown for clarity, but will not be substituted.
# Learn more here: https://www.labkey.org/Documentation/wiki-page.view?name=serviceFile
Expand All @@ -10,7 +10,7 @@ After=syslog.target network.target

[Service]
Type=simple
Environment="JAVA_HOME=/usr/lib/jvm/jdk-17.0.10+7"
Environment="JAVA_HOME=/usr/lib/jvm/jdk-version"
Environment="LABKEY_HOME=/labkey/labkey"
Environment="JAVA_FLAGS_JAR_OPS=-Dorg.apache.catalina.startup.EXIT_ON_INIT_FAILURE=true -DterminateOnStartupFailure=true"
Environment="JAVA_REFLECTION_JAR_OPS=--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
Expand Down