Skip to content
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.

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

Update files included with embedded distributions #765

Merged
merged 5 commits into from
Mar 13, 2024

Conversation

labkey-tchad
Copy link
Member

Rationale

The service scripts and application.properties need some polish before we ship them.
server/configs/application.properties is used for dev deployments and TeamCity. This file should have a comprehensive list of available properties.
server/configs/webapps/embedded/config/application.properties is the one included in distributions. This should have a more pared down set of properties and won't have the @@value@@ placeholders used for string replacement by the gradle plugin.

Related Pull Requests

Changes

  • Tidy up application.properties files
  • Remove some internal properties from properties included with distributions (CSP configs and json access log)
  • Remove mentions of Tomcat from service scripts

Co-authored-by: Josh Eckels <jeckels@labkey.com>
@labkey-tchad labkey-tchad merged commit 816f4db into release24.3-SNAPSHOT Mar 13, 2024
2 checks passed
@labkey-tchad labkey-tchad deleted the 24.3_fb_embeddedDistImprovements branch March 13, 2024 22:06

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this revised version in a recent test, but the variables do not appear to be respected.

For example, $LABKEY_HOME literally gets treated as the name of the folder, not as a substitution for /labkey/labkey. This causes a directory to be created called '$LABKEY_HOME' with the single-quotes with a path of /labkey/labkey/'$LABKEY_HOME'

In my original example file, I had to hardcode these paths for them to work as well.

https://gist.github.com/labkey-jony/12d8242e906947fa46a7b62f3238a522

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants