From d9c6f4169daf687796de092e40f47abba6671bc8 Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Tue, 2 Jul 2013 19:03:10 +0200 Subject: [PATCH] Fix issue with solrconfig and schema for Solr 3 --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index e9e9fec..3478d7c 100755 --- a/debian/rules +++ b/debian/rules @@ -103,26 +103,26 @@ install-stamp: build # 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_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) - 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_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. @@ -139,7 +139,7 @@ install-stamp: build # 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 $@ -- 1.7.10.4