Packages for Solr 4

diff --git a/debian/rules b/debian/rules
index f690f86..eaccc05 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,43 +2,79 @@
 # debian/rules for alien
 
 BASE=masterkey-lui-solr
-BASE_TOMCAT=$(BASE)-tomcat
+BASE_MASTER=$(BASE)-master
+BASE_MASTER_TOMCAT=$(BASE_MASTER)-tomcat
 BASE_SLAVE=$(BASE)-slave
 BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat
 
+BASE4=$(BASE)4
+BASE4_TOMCAT=$(BASE4)-tomcat
+BASE4_SLAVE=$(BASE4)-slave
+BASE4_SLAVE_TOMCAT=$(BASE4_SLAVE)-tomcat
+
 DOC = /usr/share/doc/masterkey
 LOG = /var/log/masterkey
+
 SHARE = /usr/share/masterkey/lui/solr
+SHARE4 = /usr/share/masterkey/lui/solr4
 
 CONF_MASTER = $(SHARE)/master
 CONF_SLAVE  = $(SHARE)/slave
 
+CONF4_MASTER = $(SHARE4)/master
+CONF4_SLAVE  = $(SHARE4)/slave
+
 DATA = /var/lib/masterkey/lui/solr
 DATA_MASTER = $(DATA)/master
 DATA_SLAVE  = $(DATA)/slave
 
+DATA4 = /var/lib/masterkey/lui/solr4
+DATA4_MASTER = $(DATA4)/master
+DATA4_SLAVE  = $(DATA4)/slave
+
 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_SOLR4_COMMON = $(BASE4)-common
+LUI_SOLR4_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_COMMON)
+LUI_SOLR4_COMMON_DIR = $(LUI_SOLR4_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)$(CONF_MASTER)
 LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
 
+LUI_SOLR4_MASTER = $(BASE4)-master
+LUI_SOLR4_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_MASTER)
+LUI_SOLR4_MASTER_SHARE_DIR = $(LUI_SOLR4_MASTER_ROOT)$(CONF4_MASTER)
+LUI_SOLR4_MASTER_LIB_DIR = $(LUI_SOLR4_MASTER_ROOT)$(DATA4_MASTER)
+
+
 LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat
 LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
 
+LUI_SOLR4_MASTER_TOMCAT = $(LUI_SOLR4_MASTER)-tomcat
+LUI_SOLR4_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_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)$(CONF_SLAVE)
 LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
 
-LUI_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat
+LUI_SOLR4_SLAVE = $(BASE4)-slave
+LUI_SOLR4_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR4_SLAVE)
+LUI_SOLR4_SLAVE_SHARE_DIR = $(LUI_SOLR4_SLAVE_ROOT)$(CONF4_SLAVE)
+LUI_SOLR4_SLAVE_LIB_DIR = $(LUI_SOLR4_SLAVE_ROOT)$(DATA4_SLAVE)
+
+LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_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=4.3.1
+LUI_SOLR4_SLAVE_TOMCAT = $(LUI_SOLR4_SLAVE)-tomcat
+LUI_SOLR4_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
+
+SOLR_VERSION=3.6.1
+SOLR4_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -61,27 +97,49 @@ install-stamp: build
        mkdir -p $(LUI_SOLR_COMMON_DIR)
        cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR)
 
+       # lui-solr4-common. Install a Solr WAR.
+       mkdir -p $(LUI_SOLR4_COMMON_DIR)
+       cp dist/apache-solr-$(SOLR4_VERSION).war -d $(LUI_SOLR4_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
        mkdir -p $(LUI_SOLR_MASTER_LIB_DIR)
 
+       # lui-solr4-master
+       mkdir -p    $(LUI_SOLR4_MASTER_SHARE_DIR)
+       cp -rp conf $(LUI_SOLR4_MASTER_SHARE_DIR)
+       ln -sf solrconfig-master.xml $(LUI_SOLR4_MASTER_SHARE_DIR)/solrconfig.xml
+       mkdir -p $(LUI_SOLR4_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
        mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
 
+       # lui-solr4-slave Slave configuration
+       mkdir -p    $(LUI_SOLR4_SLAVE_SHARE_DIR)
+       cp -rp conf $(LUI_SOLR4_SLAVE_SHARE_DIR)
+       ln -sf solrconfig-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/solrconfig.xml
+       mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR)
+
        # 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
+
+       # lui-solr4-master plumbing for Tomcat 6. 
+       mkdir -p $(LUI_SOLR4_MASTER_ROOT)/etc/masterkey/lui
+       cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR4_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
+
+       # lui-solr4-slave plumbing for Tomcat 6
+       mkdir -p $(LUI_SOLR4_SLAVE_ROOT)/etc/masterkey/lui
+       cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
 
        touch $@