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

SOLR-15046: Check if SOLR_SSL_ENABLED strictly equal to true for setting solr.jetty.https.port #2145

Merged
merged 2 commits into from Dec 14, 2020
Merged

SOLR-15046: Check if SOLR_SSL_ENABLED strictly equal to true for setting solr.jetty.https.port #2145

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
cfe75b3
SOLR-15046: Check if SOLR_SSL_ENABLED strictly equal to true for sett…
thelabdude Dec 14, 2020
c3f6863
Add solr/CHANGES.txt entry
thelabdude Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Expand Up @@ -77,6 +77,8 @@ Bug Fixes
* SOLR-12182: Don't persist base_url in ZK as the URL scheme is variable, compute from node_name instead when reading
state back from ZK. (Timothy Potter)

* SOLR-15046: Check if SOLR_SSL_ENABLED strictly equal to true for setting solr.jetty.https.port (Timothy Potter)


Other Changes
---------------------
Expand Down
2 changes: 1 addition & 1 deletion solr/bin/solr
View file
Open in desktop
Expand Up @@ -2151,7 +2151,7 @@ function start_solr() {
fi

# If SSL-related system props are set, add them to SOLR_OPTS
if [ "$SOLR_SSL_ENABLED" ]; then
if [ "$SOLR_SSL_ENABLED" == "true" ]; then
# If using SSL and solr.jetty.https.port not set explicitly, use the jetty.port
SSL_PORT_PROP="-Dsolr.jetty.https.port=$SOLR_PORT"
SOLR_OPTS+=($SOLR_SSL_OPTS "$SSL_PORT_PROP")
Expand Down