Refactor to new solr war name

[lui-solr.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 6ee5be8..4c7d85d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ LOG = /var/log/masterkey
 
 SHARE = /usr/share/masterkey/lui/solr4
 
-CONF_MASTER = $(SHARE)/master
-CONF_SLAVE  = $(SHARE)/slave
+CONF_MASTER = $(SHARE)/master/collection1/
+CONF_SLAVE  = $(SHARE)/slave/collection1/
 
 DATA = /var/lib/masterkey/lui/solr4
 DATA_MASTER = $(DATA)/master
@@ -28,10 +28,10 @@ LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(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_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-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)-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
@@ -39,10 +39,10 @@ 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_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat
+LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat6
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-
-SOLR_VERSION=4.3.1
+CATALINA_HOME=/usr/share/tomcat6
+SOLR_VERSION=4.4.0
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -63,26 +63,26 @@ 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 conf3 $(LUI_SOLR_MASTER_SHARE_DIR)
-       mv $(LUI_SOLR_MASTER_SHARE_DIR)/conf3 $(LUI_SOLR_MASTER_SHARE_DIR)/conf
+       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 -rp conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)
-       mv $(LUI_SOLR_SLAVE_SHARE_DIR)/conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)/conf
+       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 CATALINA_HOME
        mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
-       cp -r lib/ $(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