X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=debian%2Frules;h=8a107e9050f69db07a8906134c2e3682ba44ff21;hb=6ef2d81b0866d11ed6be514cce7211a2703147e1;hp=9ed865911cdca828e6999b2729010adbaf6cb552;hpb=2095ce21ed0a61a8007a9770faee9fd78f5ebc27;p=lui-solr.git

diff --git a/debian/rules b/debian/rules
index 9ed8659..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)
-	ln -sf $(LUI_SOLR_MASTER_SHARE_DIR)/lui-solrconfig-master.conf $(LUI_SOLR_MASTER_SHARE_DIR)/solrconfig.conf
+	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)
-	ln -sf $(LUI_SOLR_SLAVE_SHARE_DIR)/lui-solrconfig-master.conf $(LUI_SOLR_SLAVE_SHARE_DIR)/solrconfig.conf
+	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 $@