tflobbe commented on code in PR #2100:
URL: https://github.com/apache/solr/pull/2100#discussion_r1409707496
##########
solr/bin/solr:
##########
@@ -208,9 +208,17 @@ if [ -z "${SOLR_SSL_ENABLED:-}" ]; then
fi
if [ "$SOLR_SSL_ENABLED" == "true" ]; then
SOLR_JETTY_CONFIG+=("--module=https"
"--lib=$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*")
+ if [ "${SOLR_SSL_RELOAD_ENABLED:-true}" == "true" ]; then
+ SOLR_JETTY_CONFIG+=("--module=ssl-reload")
+ SOLR_SSL_OPTS+=" -Dsolr.keyStoreReload.enabled=true"
+ fi
SOLR_URL_SCHEME=https
if [ -n "$SOLR_SSL_KEY_STORE" ]; then
SOLR_SSL_OPTS+=" -Dsolr.jetty.keystore=$SOLR_SSL_KEY_STORE"
+ if [ "${SOLR_SSL_RELOAD_ENABLED:-true}" == "true" ] && [
"${SOLR_SECURITY_MANAGER_ENABLED:-true}" == "true" ]; then
+ # In this case we need to allow reads from the parent directory of the
keystore
+ SOLR_SSL_OPTS+=" -Dsolr.jetty.keystoreParentPath=$SOLR_SSL_KEY_STORE/.."
Review Comment:
Yes, without this, the tests with SSL + Security Manager will fail. I
believe the reason is that the KeyStoreScanner uses the parent file
[here](https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java#L67)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
