X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=debian%2Frules;h=f690f86732415db969b3dddeed4e3b6637428e48;hp=9ed865911cdca828e6999b2729010adbaf6cb552;hb=2f035995eb13aedab16e53bfef62c11a7c021ddf;hpb=2095ce21ed0a61a8007a9770faee9fd78f5ebc27

diff --git a/debian/rules b/debian/rules
index 9ed8659..f690f86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,31 +7,38 @@ BASE_SLAVE=$(BASE)-slave
 BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat
 
 DOC = /usr/share/doc/masterkey
-SHARE = /usr/share/masterkey
 LOG = /var/log/masterkey
+SHARE = /usr/share/masterkey/lui/solr
+
+CONF_MASTER = $(SHARE)/master
+CONF_SLAVE  = $(SHARE)/slave
+
+DATA = /var/lib/masterkey/lui/solr
+DATA_MASTER = $(DATA)/master
+DATA_SLAVE  = $(DATA)/slave
 
 LUI_SOLR_COMMON = $(BASE)-common
 LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
-LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)/usr/share/masterkey/lui/solr/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
 
 LUI_SOLR_MASTER = $(BASE)-master
 LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
-LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)/usr/share/masterkey/lui/solr/master
-LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)/var/lib/masterkey/lui/solr/master
+LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER)
+LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
 
 LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat
 LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
 
 LUI_SOLR_SLAVE = $(BASE)-slave
 LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_SLAVE)
-LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)/usr/share/masterkey/lui/slave
-LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)/var/lib/masterkey/lui/slave
+LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE)
+LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
 
 LUI_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 #LUI_SOLR_SHARE = $(LUI_SLAVE_TOMCAT_ROOT)/usr/share/masterkey/$(LUI_SLAVE_TOMCAT)
 
-SOLR_VERSION=3.6.1
+SOLR_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -55,25 +62,25 @@ install-stamp: build
 	cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR)
 
 	# lui-solr-master
-	mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR)
-	cp -r conf/. -d $(LUI_SOLR_MASTER_SHARE_DIR)
-	ln -sf $(LUI_SOLR_MASTER_SHARE_DIR)/lui-solrconfig-master.conf $(LUI_SOLR_MASTER_SHARE_DIR)/solrconfig.conf
+	mkdir -p    $(LUI_SOLR_MASTER_SHARE_DIR)
+	cp -rp conf $(LUI_SOLR_MASTER_SHARE_DIR)
+	ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/solrconfig.xml
 	mkdir -p $(LUI_SOLR_MASTER_LIB_DIR)
 
 	# lui-solr-slave Slave configuration
-	mkdir -p $(LUI_SOLR_SLAVE_SHARE_DIR)
-	cp -r conf/. -d $(LUI_SOLR_SLAVE_SHARE_DIR)
-	ln -sf $(LUI_SOLR_SLAVE_SHARE_DIR)/lui-solrconfig-master.conf $(LUI_SOLR_SLAVE_SHARE_DIR)/solrconfig.conf
+	mkdir -p    $(LUI_SOLR_SLAVE_SHARE_DIR)
+	cp -rp conf $(LUI_SOLR_SLAVE_SHARE_DIR)
+	ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/solrconfig.xml
 	mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
 
 	# lui-solr-master plumbing for Tomcat 6. 
 	mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
-	cp etc/solr-tomcat-context.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml
+	cp etc/solr-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml
 #	mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui
 
 	# lui-solr-slave plumbing for Tomcat 6
 	mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
-	cp etc/solr-tomcat-context.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
+	cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
 #	mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui
 
 	touch $@