diff --git a/entrypoint.sh b/entrypoint.sh index 4feb131..2423376 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -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 \ diff --git a/startup/basic.properties b/startup/basic.properties index e253851..d5c887e 100644 --- a/startup/basic.properties +++ b/startup/basic.properties @@ -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} diff --git a/startup/lims_starter.properties b/startup/lims_starter.properties index 9db0ece..03c9aaa 100644 --- a/startup/lims_starter.properties +++ b/startup/lims_starter.properties @@ -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