lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jan...@apache.org
Subject lucene-solr:master: SOLR-12237: Fix incorrect SOLR_SSL_KEYSTORE_TYPE variable in solr start script
Date Thu, 03 Jan 2019 18:40:53 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 00f8f3a13 -> 9488c8f68


SOLR-12237: Fix incorrect SOLR_SSL_KEYSTORE_TYPE variable in solr start script


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9488c8f6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9488c8f6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9488c8f6

Branch: refs/heads/master
Commit: 9488c8f6880a0fee41e2114def51117a2269e1f0
Parents: 00f8f3a
Author: Jan Høydahl <janhoy@apache.org>
Authored: Thu Jan 3 19:40:47 2019 +0100
Committer: Jan Høydahl <janhoy@apache.org>
Committed: Thu Jan 3 19:40:47 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/9488c8f6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8d081ae..6bcd556 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -214,6 +214,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/9488c8f6/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 4bd05df..e3d0d4e 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -227,7 +227,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
 


Mime
View raw message