From 7cb2a0475b59832696f4bc9ee1809a0e1430ee18 Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Wed, 30 Jan 2013 21:02:25 +0100 Subject: [PATCH] Issue with slave --- debian/rules | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index 8a107e9..a46f443 100755 --- a/debian/rules +++ b/debian/rules @@ -7,25 +7,32 @@ BASE_SLAVE=$(BASE)-slave BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat DOC = /usr/share/doc/masterkey -SHARE = /usr/share/masterkey LOG = /var/log/masterkey +SHARE = /usr/share/masterkey/lui/solr + +CONF_MASTER = $(SHARE)/master +CONF_SLAVE = $(SHARE)/slave + +DATA = /var/lib/masterkey/lui/solr +DATA_MASTER = $(DATA)/master +DATA_SLAVE = $(DATA)/slave LUI_SOLR_COMMON = $(BASE)-common LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON) -LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)/usr/share/masterkey/lui/solr/war +LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war LUI_SOLR_MASTER = $(BASE)-master LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER) -LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)/usr/share/masterkey/lui/solr/master -LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)/var/lib/masterkey/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 = $(LUI_SOLR_MASTER)-tomcat LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT) LUI_SOLR_SLAVE = $(BASE)-slave LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_SLAVE) -LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)/usr/share/masterkey/lui/slave -LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)/var/lib/masterkey/lui/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_TOMCAT = $(LUI)-slave-tomcat LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT) -- 1.7.10.4