Fix issue with solrconfig and schema for Solr 3

diff --git a/debian/rules b/debian/rules
index e9e9fec..3478d7c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -103,26 +103,26 @@ install-stamp: build
 
        # lui-solr-master
        mkdir -p    $(LUI_SOLR_MASTER_SHARE_DIR)
 
        # lui-solr-master
        mkdir -p    $(LUI_SOLR_MASTER_SHARE_DIR)

-       cp -rp conf $(LUI_SOLR_MASTER_SHARE_DIR)
+       cp -rp conf3 $(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-solr4-master
        mkdir -p    $(LUI_SOLR4_MASTER_SHARE_DIR)
        cp -rp conf $(LUI_SOLR4_MASTER_SHARE_DIR)
        ln -sf solrconfig-master.xml $(LUI_SOLR_MASTER_SHARE_DIR)/conf/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
+       ln -sf solrconfig-master.xml $(LUI_SOLR4_MASTER_SHARE_DIR)/conf/solrconfig.xml

        mkdir -p $(LUI_SOLR4_MASTER_LIB_DIR)
 
        # lui-solr-slave Slave configuration
        mkdir -p    $(LUI_SOLR_SLAVE_SHARE_DIR)
        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)
+       cp -rp conf3 $(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)
 
        # 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_SOLR_SLAVE_SHARE_DIR)/conf/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
+       ln -sf solrconfig4-slave.xml $(LUI_SOLR4_SLAVE_SHARE_DIR)/conf/solrconfig.xml

        mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR)
 
        # lui-solr-master plumbing for Tomcat 6. 
        mkdir -p $(LUI_SOLR4_SLAVE_LIB_DIR)
 
        # lui-solr-master plumbing for Tomcat 6. 

@@ -139,7 +139,7 @@ install-stamp: build
 
        # lui-solr4-slave plumbing for Tomcat 6
        mkdir -p $(LUI_SOLR4_SLAVE_ROOT)/etc/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
+       cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml

 
        touch $@
 
 
        touch $@