-CONF_MASTER = $(SHARE)/master
-CONF_SLAVE = $(SHARE)/slave
+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
LUI_SOLR_MASTER = $(BASE)-master
LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER)
LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
LUI_SOLR_MASTER = $(BASE)-master
LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER)
LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
LUI_SOLR_SLAVE = $(BASE)-slave
LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
LUI_SOLR_SLAVE = $(BASE)-slave
LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE)
LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE)
LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
+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)
- cp dist/apache-solr-$(SOLR_VERSION).war -d $(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)
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)
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)
ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
# Common lui-solr4-tomcat: Logging Libraries installed under tomcat6.
# Harvester Utilities. Stylesheet used in includes needs to be in CATALINA_HOME
mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
ln -sf solrconfig-slave.xml $(LUI_SOLR_SLAVE_SHARE_DIR)/conf/solrconfig.xml
mkdir -p $(LUI_SOLR_SLAVE_LIB_DIR)
# Common lui-solr4-tomcat: Logging Libraries installed under tomcat6.
# Harvester Utilities. Stylesheet used in includes needs to be in CATALINA_HOME
mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
- cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
+ 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)
+