Skip to content

remove ssl settings included in jar as of 26.1 #77

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

Merged
labkey-willm merged 1 commit into from
Dec 6, 2025
Merged

remove ssl settings included in jar as of 26.1 #77

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
install-script.code-workspace
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ The following tables list the available input variables and default values. In t
| TOMCAT_KEYSTORE_ALIAS | Alias for TLS cert in keystore | tomcat | yes |
| TOMCAT_KEYSTORE_FORMAT | tomcat Keystore file format | PKCS12 | no |
| TOMCAT_KEYSTORE_PASSWORD | Password used for tomcat keystore | Randomly generated if none is provided | yes |
| TOMCAT_SSL_CIPHERS | Tomcat SSL Ciphers | HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL | no |
| TOMCAT_SSL_ENABLED_PROTOCOLS | Tomcat TLS enabled protocols | ${TOMCAT_SSL_ENABLED_PROTOCOLS:-TLSv1.3,+TLSv1.2 | no |
| TOMCAT_SSL_PROTOCOL | Tomcat SSL Protocol | TLS | no |

### Standard tomcat Install Type Inputs

Expand Down
7 changes: 0 additions & 7 deletions install-labkey.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,6 @@ function step_default_envs() {
TOMCAT_KEYSTORE_FORMAT="${TOMCAT_KEYSTORE_FORMAT:-PKCS12}"
TOMCAT_SESSION_TIMEOUT="${TOMCAT_SESSION_TIMEOUT:-30}"

TOMCAT_SSL_CIPHERS="${TOMCAT_SSL_CIPHERS:-HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL}"
TOMCAT_SSL_ENABLED_PROTOCOLS="${TOMCAT_SSL_ENABLED_PROTOCOLS:-TLSv1.3,+TLSv1.2}"
TOMCAT_SSL_PROTOCOL="${TOMCAT_SSL_PROTOCOL:-TLS}"

# Used for Standard Tomcat installs only
TOMCAT_VERSION="${TOMCAT_VERSION:-9.0.65}"
TOMCAT_URL="http://archive.apache.org/dist/tomcat/tomcat-9/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz"
Expand Down Expand Up @@ -488,13 +484,10 @@ function step_create_app_properties() {
server.port=${LABKEY_HTTPS_PORT}

server.ssl.enabled=true
server.ssl.enabled-protocols=${TOMCAT_SSL_ENABLED_PROTOCOLS}
server.ssl.protocol=${TOMCAT_SSL_PROTOCOL}
server.ssl.key-alias=${TOMCAT_KEYSTORE_ALIAS}
server.ssl.key-store=${TOMCAT_KEYSTORE_BASE_PATH}/${TOMCAT_KEYSTORE_FILENAME}
server.ssl.key-store-password=${TOMCAT_KEYSTORE_PASSWORD}
server.ssl.key-store-type=${TOMCAT_KEYSTORE_FORMAT}
server.ssl.ciphers=${TOMCAT_SSL_CIPHERS}

# HTTP-only port for servers that need to handle both HTTPS (configure via server.port and server.ssl above) and HTTP
#context.httpPort=8080
Expand Down
Loading