From bdc7f3fb570c597976e1fcb2c0a91885ac4e9bdc Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 2 Dec 2015 01:26:13 +0900 Subject: [PATCH] dist: export SCYLLA_HOME, SCYLLA_CONF --- dist/common/sysconfig/scylla-jmx | 6 ++++++ dist/ubuntu/debian/scylla-jmx.init | 1 + dist/ubuntu/debian/scylla-jmx.upstart | 1 + 3 files changed, 8 insertions(+) diff --git a/dist/common/sysconfig/scylla-jmx b/dist/common/sysconfig/scylla-jmx index 07cf22b..321c873 100644 --- a/dist/common/sysconfig/scylla-jmx +++ b/dist/common/sysconfig/scylla-jmx @@ -6,3 +6,9 @@ API_PORT=10000 # The API address to connect to ADDR=127.0.0.1 + +# scylla home dir +SCYLLA_HOME=/var/lib/scylla + +# scylla config dir +SCYLLA_CONF=/etc/scylla diff --git a/dist/ubuntu/debian/scylla-jmx.init b/dist/ubuntu/debian/scylla-jmx.init index ebac99e..62e144d 100644 --- a/dist/ubuntu/debian/scylla-jmx.init +++ b/dist/ubuntu/debian/scylla-jmx.init @@ -29,6 +29,7 @@ SCRIPTNAME=/etc/init.d/$NAME # Read configuration variable file if it is present [ -r /etc/default/$NAME ] && . /etc/default/$NAME +export SCYLLA_HOME SCYLLA_CONF DAEMON=/usr/lib/scylla/jmx/scylla-jmx -jp $JMX_PORT -p $API_PORT -a $ADDR -l /usr/lib/scylla/jmx # Define LSB log_* functions. diff --git a/dist/ubuntu/debian/scylla-jmx.upstart b/dist/ubuntu/debian/scylla-jmx.upstart index 39f6a96..6546851 100644 --- a/dist/ubuntu/debian/scylla-jmx.upstart +++ b/dist/ubuntu/debian/scylla-jmx.upstart @@ -13,5 +13,6 @@ console log script . /etc/default/scylla-jmx + export SCYLLA_HOME SCYLLA_CONF exec /usr/lib/scylla/jmx/scylla-jmx -jp $JMX_PORT -p $API_PORT -a $ADDR -l /usr/lib/scylla/jmx end script