X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=debian%2Frules;h=c637b0951cc179cade1b9bec2c6d832ffe2a7d30;hb=a596b8053e1d026541ae6b314593f3df43a52c3f;hp=92025824d9a62756a7c9a623d7271ba54fa02379;hpb=ce3d695f541af1a004c1794b88ba0537cc202c97;p=lui-solr.git

diff --git a/debian/rules b/debian/rules
index 9202582..c637b09 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,13 @@ 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)
 	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)
 	ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
 	mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)