From: Jakub Skoczen <jakub@indexdata.com>
Date: Thu, 22 Oct 2015 12:35:00 +0000 (+0000)
Subject: Strip version from solr war
X-Git-Tag: v0.9
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=b2e4ea6ad0f1480f387b0996f34dff628a33d8c1;p=lui-solr.git

Strip version from solr war
---

diff --git a/debian/rules b/debian/rules
index bc7e7b6..c389f54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ install-stamp: build
 	# lui-solr-common. Install a Solr WAR.
 	mkdir -p $(LUI_SOLR_COMMON_DIR)
 	mkdir -p $(LUI_SOLR_COMMON_DIR)/war
-	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/
+	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/solr.war
 	cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
 	# lui-solr-master
diff --git a/etc/solr4-tomcat-context-master.xml b/etc/solr4-tomcat-context-master.xml
index aa5fa54..7cda8a2 100644
--- a/etc/solr4-tomcat-context-master.xml
+++ b/etc/solr4-tomcat-context-master.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Version 0.6.2. Adding comment to force config update  -->
 <Context 
-    docBase="/usr/share/masterkey/lui/solr4/war/solr-4.6.0.war" 
+    docBase="/usr/share/masterkey/lui/solr4/war/solr.war" 
     path="/solr4"
 >
   <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/master" override="true"/>
diff --git a/etc/solr4-tomcat-context-slave.xml b/etc/solr4-tomcat-context-slave.xml
index f68b8b4..edc316b 100644
--- a/etc/solr4-tomcat-context-slave.xml
+++ b/etc/solr4-tomcat-context-slave.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Version 0.6.2. Adding comment to force check -->
 <Context 
-    docBase="/usr/share/masterkey/lui/solr4/war/solr-4.6.0.war" 
+    docBase="/usr/share/masterkey/lui/solr4/war/solr.war" 
     path="/solr4-slave"
 >
   <Environment name="solr/home" type="java.lang.String" value="/usr/share/masterkey/lui/solr4/slave" override="true"/>