projects
/
lui-solr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
:Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr
[lui-solr.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
4c7d85d
..
ec07092
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-14,14
+14,16
@@
SHARE = /usr/share/masterkey/lui/solr4
CONF_MASTER = $(SHARE)/master/collection1/
CONF_SLAVE = $(SHARE)/slave/collection1/
CONF_MASTER = $(SHARE)/master/collection1/
CONF_SLAVE = $(SHARE)/slave/collection1/
+CONF_ZK = $(SHARE)/zookeeper/
DATA = /var/lib/masterkey/lui/solr4
DATA_MASTER = $(DATA)/master
DATA_SLAVE = $(DATA)/slave
DATA = /var/lib/masterkey/lui/solr4
DATA_MASTER = $(DATA)/master
DATA_SLAVE = $(DATA)/slave
+DATA_ZK = $(DATA)/zk-first
LUI_SOLR_COMMON = $(BASE)-common
LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
LUI_SOLR_COMMON = $(BASE)-common
LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
-LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)
LUI_SOLR_MASTER = $(BASE)-master
LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
LUI_SOLR_MASTER = $(BASE)-master
LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
@@
-44,6
+46,12
@@
LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
CATALINA_HOME=/usr/share/tomcat6
SOLR_VERSION=4.4.0
CATALINA_HOME=/usr/share/tomcat6
SOLR_VERSION=4.4.0
+LUI_SOLR_ZK = $(BASE)-zookeeper
+LUI_SOLR_ZK_ROOT = $(CURDIR)/debian/$(LUI_SOLR_ZK)
+LUI_SOLR_ZK_SHARE_DIR = $(LUI_SOLR_ZK_ROOT)$(CONF_ZK)
+LUI_SOLR_ZK_LIB_DIR = $(LUI_SOLR_ZK_ROOT)$(DATA_ZK)
+
+
PACKAGE=$(shell dh_listpackages)
build:
PACKAGE=$(shell dh_listpackages)
build:
@@
-63,7
+71,8
@@
install-stamp: build
# lui-solr-common. Install a Solr WAR.
mkdir -p $(LUI_SOLR_COMMON_DIR)
# lui-solr-common. Install a Solr WAR.
mkdir -p $(LUI_SOLR_COMMON_DIR)
- cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+ mkdir -p $(LUI_SOLR_COMMON_DIR)/war
+ cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/
cp -rp scripts $(LUI_SOLR_COMMON_DIR)
# lui-solr-master
cp -rp scripts $(LUI_SOLR_COMMON_DIR)
# lui-solr-master
@@
-92,6
+101,12
@@
install-stamp: build
mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
+ # lui-solr-zookeeper
+ mkdir -p $(LUI_SOLR_ZK_SHARE_DIR)
+ cp -rp zookeeper $(LUI_SOLR_ZK_SHARE_DIR)
+ mkdir -p $(LUI_SOLR_ZK_LIB_DIR)
+
+
touch $@
binary: build install
touch $@
binary: build install