From 1ab26b5520c13f9071026e66e42e173b674a55f5 Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Thu, 15 Aug 2013 18:15:54 +0200 Subject: [PATCH] Use Solr 4 config! --- debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index 9202582..3578778 100755 --- 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 @@ -67,15 +67,15 @@ install-stamp: build # 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) +# mv $(LUI_SOLR_MASTER_SHARE_DIR)/conf3 $(LUI_SOLR_MASTER_SHARE_DIR)/conf 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) +# mv $(LUI_SOLR_SLAVE_SHARE_DIR)/conf3 $(LUI_SOLR_SLAVE_SHARE_DIR)/conf ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR) -- 1.7.10.4