X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=ec07092b343592a319dfd7c15798cd471c2113f8;hb=8ccbd8c80f78ce6c7015ade8fbbc889b462f6a80;hp=140f88ceb8c1c2a8a25d6aad1bbad7f0a575885f;hpb=62068db230804ef48d6e48df9b99260893d80393;p=lui-solr.git

diff --git a/debian/rules b/debian/rules
index 140f88c..ec07092 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,14 +14,16 @@ SHARE = /usr/share/masterkey/lui/solr4
 
 CONF_MASTER = $(SHARE)/master/collection1/
 CONF_SLAVE  = $(SHARE)/slave/collection1/
+CONF_ZK = $(SHARE)/zookeeper/
 
 DATA = /var/lib/masterkey/lui/solr4
 DATA_MASTER = $(DATA)/master
 DATA_SLAVE  = $(DATA)/slave
+DATA_ZK = $(DATA)/zk-first
 
 LUI_SOLR_COMMON = $(BASE)-common
 LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
-LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)
 
 LUI_SOLR_MASTER = $(BASE)-master
 LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
@@ -42,7 +44,13 @@ LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
 LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat6
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 CATALINA_HOME=/usr/share/tomcat6
-SOLR_VERSION=4.3.1
+SOLR_VERSION=4.4.0
+
+LUI_SOLR_ZK = $(BASE)-zookeeper
+LUI_SOLR_ZK_ROOT = $(CURDIR)/debian/$(LUI_SOLR_ZK)
+LUI_SOLR_ZK_SHARE_DIR = $(LUI_SOLR_ZK_ROOT)$(CONF_ZK)
+LUI_SOLR_ZK_LIB_DIR = $(LUI_SOLR_ZK_ROOT)$(DATA_ZK)
+
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -63,7 +71,8 @@ install-stamp: build
 
 	# lui-solr-common. Install a Solr WAR.
 	mkdir -p $(LUI_SOLR_COMMON_DIR)
-	cp dist/apache-solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+	mkdir -p $(LUI_SOLR_COMMON_DIR)/war
+	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/
 	cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
 	# lui-solr-master
@@ -92,6 +101,12 @@ install-stamp: build
 	mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
 	cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
 
+	# lui-solr-zookeeper
+	mkdir -p    $(LUI_SOLR_ZK_SHARE_DIR)
+	cp -rp zookeeper $(LUI_SOLR_ZK_SHARE_DIR)
+	mkdir -p $(LUI_SOLR_ZK_LIB_DIR)
+
+
 	touch $@
 
 binary: build install