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.

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

Jump to bottom

remove newinstall flag and be deliberate about startup properties by … #40

Merged
merged 2 commits into from
Aug 18, 2023
Merged

remove newinstall flag and be deliberate about startup properties by … #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b62df3
remove newinstall flag and be deliberate about startup properties by …
labkey-stuartm Aug 18, 2023
d02c135
remove newinstall flag
labkey-stuartm Aug 18, 2023
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: 0 additions & 2 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ main() {
-passout "pass:${keystore_pass}" \
>/dev/null 2>&1

touch server/startup/newinstall

if [ -n "${DEBUG:-}" ]; then
tail -n+1 \
config/*.properties \
Expand Down
4 changes: 2 additions & 2 deletions startup/basic.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SiteSettings.baseServerURL;bootstrap=${LABKEY_BASE_SERVER_URL}
Authentication.DefaultDomain;bootstrap=${LABKEY_DEFAULT_DOMAIN}
SiteSettings.pipelineToolsDirectory;bootstrap=${LABKEY_HOME}

SiteSettings.sslPort=${LABKEY_PORT}
SiteSettings.sslRequired=true
SiteSettings.sslPort;startup=${LABKEY_PORT}
SiteSettings.sslRequired;startup=true

${LABKEY_STARTUP_BASIC_EXTRA}
16 changes: 8 additions & 8 deletions startup/lims_starter.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FolderTypes.disabledTypes=Dataspace
FolderTypes.disabledTypes;bootstrap=Dataspace

LookAndFeelSettings.customStylesheet=sampleManagement:data/files/customStylesheet.css
LookAndFeelSettings.iconImage=sampleManagement:data/files/iconImage.ico
LookAndFeelSettings.logoImage=sampleManagement:data/files/logoImage.svg
LookAndFeelSettings.themeName=Sky
LookAndFeelSettings.customStylesheet;bootstrap=sampleManagement:data/files/customStylesheet.css
LookAndFeelSettings.iconImage;bootstrap=sampleManagement:data/files/iconImage.ico
LookAndFeelSettings.logoImage;bootstrap=sampleManagement:data/files/logoImage.svg
LookAndFeelSettings.themeName;bootstrap=Sky

SampleManager.updateSecurityEmailTemplates=true
SampleManager.updateSecurityEmailTemplates;bootstrap=true

SiteSettings.homeProjectFolderType=Sample Manager
SiteSettings.homeProjectResetPermissions=true
SiteSettings.homeProjectFolderType;bootstrap=Sample Manager
SiteSettings.homeProjectResetPermissions;bootstrap=true

# LKSM Pro
ModuleLoader.exclude=biologics
Expand Down