projects
/
lui-solr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ef2d81
)
Issue with slave
author
Dennis Schafroth
<dennis@indexdata.com>
Wed, 30 Jan 2013 20:02:25 +0000
(21:02 +0100)
committer
Dennis Schafroth
<dennis@indexdata.com>
Wed, 30 Jan 2013 20:02:25 +0000
(21:02 +0100)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index
8a107e9
..
a46f443
100755
(executable)
--- 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
BASE_SLAVE_TOMCAT=$(BASE_SLAVE)-tomcat
DOC = /usr/share/doc/masterkey
-SHARE = /usr/share/masterkey
LOG = /var/log/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 = $(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 = $(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_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)
LUI_SOLR_SLAVE_TOMCAT = $(LUI)-slave-tomcat
LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)