projects
/
lui-solr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7cb0d85
)
Fix solr config location . Link special context for master and slave
author
Dennis Schafroth
<dennis@indexdata.com>
Wed, 30 Jan 2013 15:32:00 +0000
(16:32 +0100)
committer
Dennis Schafroth
<dennis@indexdata.com>
Wed, 30 Jan 2013 15:32:00 +0000
(16:32 +0100)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index
9dbe3de
..
8a107e9
100755
(executable)
--- 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
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
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
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
# 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 $@
# mkdir -p $(TOMCAT6ROOT)/var/log/masterkey/lui
touch $@