[15/50] [abbrv] lucene-solr:jira/solr-6736: SOLR-10088: Installer script does not put zoo.cfg in SOLR_HOME

[is...@apache.org]

SOLR-10088: Installer script does not put zoo.cfg in SOLR_HOME


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

Branch: refs/heads/jira/solr-6736
Commit: 59433bb460c2e55756cb3cea2aecd264e48e3b3a
Parents: 5ccc8e7
Author: Jan H�ydahl <ja...@apache.org>
Authored: Sat Mar 4 23:19:06 2017 +0100
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Sat Mar 4 23:19:06 2017 +0100

----------------------------------------------------------------------
 solr/CHANGES.txt                 | 18 ++++++++++--------
 solr/bin/install_solr_service.sh |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/59433bb4/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2ffcc46..ea56cbb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -128,7 +128,7 @@ New Features
   numeric, and conditional evaluators. BooleanOperations have been removed in preference of
   BooleanEvaluators. (Dennis Gove)
 
-* SOLR-9903: Stop interrupting the update executor on shutdown, it can cause graceful shutdowns to put replicas into Leader 
+* SOLR-9903: Stop interrupting the update executor on shutdown, it can cause graceful shutdowns to put replicas into Leader
   Initiated Recovery among other undesirable things. (Mark Miller)
 
 * SOLR-8396: Add support for PointFields in Solr (Ishan Chattopadhyaya, Tom�s Fern�ndez L�bbe)
@@ -203,6 +203,8 @@ Bug Fixes
 * SOLR-10225: Fix HDFS BlockCache evictions metric to not count explicit removal
   due to a directory close. (yonik)
 
+* SOLR-10088: Installer script does not put zoo.cfg in SOLR_HOME (janhoy)
+
 Optimizations
 ----------------------
 
@@ -232,9 +234,9 @@ Other Changes
 
 * SOLR-10018: Increase the default hl.maxAnalyzedChars to 51200 for the Unified & Postings Highlighter so that all
   highlighters now have this same default. (David Smiley)
-  
-* SOLR-6246: Added tests to check that the changes in LUCENE-7564 and LUCENE-7670 
-  enable AnalyzingInfixSuggester and BlendedInfixSuggester to play nicely with core reload.  
+
+* SOLR-6246: Added tests to check that the changes in LUCENE-7564 and LUCENE-7670
+  enable AnalyzingInfixSuggester and BlendedInfixSuggester to play nicely with core reload.
   SolrSuggester.build() now throws SolrCoreState.CoreIsClosedException when interrupted
   by a core reload/shutdown. (Steve Rowe)
 
@@ -261,8 +263,8 @@ Other Changes
 * SOLR-9842: UpdateRequestProcessors have no way to guarantee the closing of resources used for a request.
   (Mark Miller)
 
-* SOLR-9848: Lower solr.cloud.wait-for-updates-with-stale-state-pause back down from 7 seconds. 
-  (Mark Miller) 
+* SOLR-9848: Lower solr.cloud.wait-for-updates-with-stale-state-pause back down from 7 seconds.
+  (Mark Miller)
 
 * SOLR-10020: Cannot reload a core if it fails initialization. (Mike Drob via Erick Erickson)
 
@@ -273,8 +275,8 @@ Other Changes
 
 * SOLR-10214: Remove unused HDFS BlockCache metrics and add storeFails, as well as adding total
   counts for lookups, hits, and evictions. (yonik)
-  
-* SOLR-10134: EmbeddedSolrServer responds on Schema API requests (Robert Alexandersson via Mikhail Khludnev)  
+
+* SOLR-10134: EmbeddedSolrServer responds on Schema API requests (Robert Alexandersson via Mikhail Khludnev)
 
 * SOLR-10219: re-enable HDFS tests under JDK9 (hossman, Uwe Schindler)
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/59433bb4/solr/bin/install_solr_service.sh
----------------------------------------------------------------------
diff --git a/solr/bin/install_solr_service.sh b/solr/bin/install_solr_service.sh
index b331870..f42dd5a 100755
--- a/solr/bin/install_solr_service.sh
+++ b/solr/bin/install_solr_service.sh
@@ -340,7 +340,7 @@ mkdir -p "$SOLR_VAR_DIR/logs"
 if [ -f "$SOLR_VAR_DIR/data/solr.xml" ]; then
   echo -e "\n$SOLR_VAR_DIR/data/solr.xml already exists. Skipping install ...\n"
 else
-  cp "$SOLR_INSTALL_DIR/server/solr/solr.xml" "$SOLR_VAR_DIR/data/solr.xml"
+  cp "$SOLR_INSTALL_DIR/server/solr/"{solr.xml,zoo.cfg} "$SOLR_VAR_DIR/data/"
 fi
 if [ -f "$SOLR_VAR_DIR/log4j.properties" ]; then
   echo -e "\n$SOLR_VAR_DIR/log4j.properties already exists. Skipping install ...\n"