You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2019/01/03 18:42:31 UTC
lucene-solr:branch_7x: SOLR-12237: Fix incorrect
SOLR_SSL_KEYSTORE_TYPE variable in solr start script
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 490f56037 -> 94f156a17
SOLR-12237: Fix incorrect SOLR_SSL_KEYSTORE_TYPE variable in solr start script
(cherry picked from commit 9488c8f6880a0fee41e2114def51117a2269e1f0)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/94f156a1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/94f156a1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/94f156a1
Branch: refs/heads/branch_7x
Commit: 94f156a173f7f081f6465f5837a3f0a493cfd303
Parents: 490f560
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu Jan 3 19:40:47 2019 +0100
Committer: Jan Høydahl <ja...@apache.org>
Committed: Thu Jan 3 19:41:59 2019 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/bin/solr | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94f156a1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9dfef08..c20a291 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,8 @@ Bug Fixes
* SOLR-11853: Solr installer fails on SuSE linux (Markus Mandalka via janhoy)
+* SOLR-12237: Fix incorrect SOLR_SSL_KEYSTORE_TYPE variable in solr start script (janhoy, Joel Bernstein)
+
Improvements
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94f156a1/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 78840fd..3a8efb6 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -220,7 +220,7 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; then
SOLR_SSL_OPTS+=" -Djavax.net.ssl.keyStore=$SOLR_SSL_KEY_STORE"
fi
if [ -n "$SOLR_SSL_KEY_STORE_TYPE" ]; then
- SOLR_SSL_OPTS+=" -Djavax.net.ssl.keyStoreType=$SOLR_SSL_KEYSTORE_TYPE"
+ SOLR_SSL_OPTS+=" -Djavax.net.ssl.keyStoreType=$SOLR_SSL_KEY_STORE_TYPE"
fi
fi