andreacavalli
/
scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install.sh: fix hardcode sysconfdir in EnvironmentFile path 

Currently we use fixed sysconfdir name 'sysconfig', it works as
expected. But let's change it to use the assigned sysconfdir, it
still works when a different sysconfdir is assigned.

 # Without this fix:
EnvironmentFile=/home/scylla-test/scylladb/etc/sysconfig//scylla-jmx

 # Applied this fix:
EnvironmentFile=/home/scylla-test/scylladb/etc/sysconfig/scylla-jmx

v2: don't translate the path in executing install.sh, it has problem
in building rpm/deb if /etc/sysconfig is a symlink. (Avi)

Signed-off-by: Amos Kong <amos@scylladb.com>
This commit is contained in:
Amos Kong 2020-12-28 19:10:28 +08:00
parent 2c9565024f
commit 5de1a5a274
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@ -133,7 +133,7 @@ else
cat << EOS > "$rsystemd"/scylla-jmx.service.d/nonroot.conf
[Service]
EnvironmentFile=
EnvironmentFile=$retc/sysconfig/scylla-jmx
EnvironmentFile=$(realpath -m "$rsysconfdir/scylla-jmx")
ExecStart=
ExecStart=$rprefix/jmx/scylla-jmx \$SCYLLA_JMX_PORT \$SCYLLA_API_PORT \$SCYLLA_API_ADDR \$SCYLLA_JMX_ADDR \$SCYLLA_JMX_FILE \$SCYLLA_JMX_LOCAL \$SCYLLA_JMX_REMOTE \$SCYLLA_JMX_DEBUG
User=