X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=debian%2Frules;h=4c7d85d2742449bb085fea3122072914698db69c;hp=8a107e9050f69db07a8906134c2e3682ba44ff21;hb=bad54952b8267113169b31fa9f94f01519c5c4aa;hpb=635d62b0f020a49f888b8028d78cfb0b4108bc9f

diff --git a/debian/rules b/debian/rules
index 8a107e9..4c7d85d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,48 @@
 #!/usr/bin/make -f
 # debian/rules for alien
 
-BASE=masterkey-lui-solr
-BASE_TOMCAT=$(BASE)-tomcat
+BASE=masterkey-lui-solr4
+BASE_MASTER=$(BASE)-master
+BASE_MASTER_TOMCAT=$(BASE_MASTER)-tomcat
 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/solr4
+
+CONF_MASTER = $(SHARE)/master/collection1/
+CONF_SLAVE  = $(SHARE)/slave/collection1/
+
+DATA = /var/lib/masterkey/lui/solr4
+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_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-tomcat6
+LUI_SOLR_COMMON_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT)
+
+LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat6
 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 = $(LUI_SOLR_SLAVE)-tomcat6
 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
+CATALINA_HOME=/usr/share/tomcat6
+SOLR_VERSION=4.4.0
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -52,29 +63,34 @@ 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)
+	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+	cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
 	# lui-solr-master
 	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
+	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 -rp conf $(LUI_SOLR_SLAVE_SHARE_DIR)
-	ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/solrconfig.xml
+	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 CATALINA_HOME
+	mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
+	cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)
+	ls -la $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib/
+
 	# lui-solr-master plumbing for Tomcat 6. 
 	mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
-	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
+	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-slave.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
 
 	touch $@