X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=c389f541aeb3621e1f0bd134661d616b0b9710ee;hb=954dffaba7a6e5cbea557e6ba19a5bab90440200;hp=9dbe3dec648e9421f836a7dc00aa22658f872c39;hpb=9a0919965e58c4066f62c4f5012ba2c580d6a3e4;p=lui-solr.git

diff --git a/debian/rules b/debian/rules
index 9dbe3de..c389f54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,67 @@
 #!/usr/bin/make -f
 # debian/rules for alien
 
-BASE=masterkey-lui-solr
-BASE_TOMCAT=$(BASE)-tomcat
-BASE_SLAVE=$(BASE)-slave
-BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat
-
+BASE=masterkey-lui-solr4
 DOC = /usr/share/doc/masterkey
-SHARE = /usr/share/masterkey
 LOG = /var/log/masterkey
+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)/usr/share/masterkey/lui/solr/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)
 
 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_COMMON_TOMCAT6 = $(LUI_SOLR_COMMON)-tomcat6
+LUI_SOLR_COMMON_TOMCAT6_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT6)
+
+LUI_SOLR_MASTER_TOMCAT6 = $(LUI_SOLR_MASTER)-tomcat6
+LUI_SOLR_MASTER_TOMCAT6_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT6)
 
 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_TOMCAT6 = $(LUI_SOLR_SLAVE)-tomcat6
+LUI_SOLR_SLAVE_TOMCAT6_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT6)
+CATALINA6_HOME=/usr/share/tomcat6
+
+LUI_SOLR_COMMON_TOMCAT8 = $(LUI_SOLR_COMMON)-tomcat8
+LUI_SOLR_COMMON_TOMCAT8_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT8)
+
+LUI_SOLR_MASTER_TOMCAT8 = $(LUI_SOLR_MASTER)-tomcat8
+LUI_SOLR_MASTER_TOMCAT8_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT8)
+
+LUI_SOLR_SLAVE = $(BASE)-slave
+LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_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_TOMCAT8 = $(LUI_SOLR_SLAVE)-tomcat8
+LUI_SOLR_SLAVE_TOMCAT8_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT8)
+CATALINA8_HOME=/usr/share/tomcat8
 
-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.9.1
+
+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)
 
@@ -52,29 +82,56 @@ install-stamp: build
 
 	# lui-solr-common. Install a Solr WAR.
 	mkdir -p $(LUI_SOLR_COMMON_DIR)
-	cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR)
+	mkdir -p $(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
-	mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR)
-	cp -r conf/. -d $(LUI_SOLR_MASTER_SHARE_DIR)
-	ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/solrconfig.xml
+	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)/conf/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 solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/solrconfig.xml
+	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)/conf/solrconfig.xml
 	mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
 
+	# Common lui-solr4-tomcat: Logging Libraries installed under tomcat6. 
+	# Harvester Utilities. Stylesheet used in includes needs to be in CATALINA6_HOME
+	mkdir -p $(LUI_SOLR_COMMON_TOMCAT6_ROOT)$(CATALINA6_HOME)/lib
+	cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT6_ROOT)$(CATALINA6_HOME)
+	ls -la $(LUI_SOLR_COMMON_TOMCAT6_ROOT)$(CATALINA6_HOME)/lib/
+
+	# lui-solr-master plumbing for Tomcat 6. 
+	mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
+	cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr4-master.xml
+
+	# lui-solr-slave plumbing for Tomcat 6
+	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
+
+	# Common lui-solr4-tomcat: Logging Libraries installed under tomcat8. 
+	# Harvester Utilities. Stylesheet used in includes needs to be in CATALINA8_HOME
+	mkdir -p $(LUI_SOLR_COMMON_TOMCAT8_ROOT)$(CATALINA8_HOME)/lib
+	cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT8_ROOT)$(CATALINA8_HOME)
+	ls -la $(LUI_SOLR_COMMON_TOMCAT8_ROOT)$(CATALINA8_HOME)/lib/
+
 	# 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
-#	mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui
+	cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr4-master.xml
 
 	# 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
-#	mkdir -p $(TOMCAT6ROOT)/var/log/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)
+	mkdir -p $(LUI_SOLR_ZK_ROOT)/etc/init.d/
+	cp -p etc/init.d/indexdata-solr-zookeeper $(LUI_SOLR_ZK_ROOT)/etc/init.d/
 
 	touch $@