From 635d62b0f020a49f888b8028d78cfb0b4108bc9f Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Wed, 30 Jan 2013 16:32:00 +0100 Subject: [PATCH] Fix solr config location . Link special context for master and slave --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index 9dbe3de..8a107e9 100755 --- a/debian/rules +++ b/debian/rules @@ -55,25 +55,25 @@ install-stamp: build cp dist/apache-solr-$(SOLR_VERSION).war -d $(LUI_SOLR_COMMON_DIR) # lui-solr-master - mkdir -p $(LUI_SOLR_MASTER_SHARE_DIR) - cp -r conf/. -d $(LUI_SOLR_MASTER_SHARE_DIR) + 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-solr-slave Slave configuration - mkdir -p $(LUI_SOLR_SLAVE_SHARE_DIR) - cp -r conf/. -d $(LUI_SOLR_SLAVE_SHARE_DIR) + 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-solr-master plumbing for Tomcat 6. mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui - cp etc/solr-tomcat-context.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml + 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-solr-slave plumbing for Tomcat 6 mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui - cp etc/solr-tomcat-context.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml + 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 touch $@ -- 1.7.10.4