From c2841c83423c1a51020acd0b953931ddbaeb121c Mon Sep 17 00:00:00 2001 From: Mark Rushakoff Date: Tue, 3 Oct 2017 11:15:22 -0700 Subject: [PATCH 1/2] Use correct variable style in influxdb.service From the systemd.service docs: Use "${FOO}" as part of a word, or as a word of its own, on the command line, in which case it will be replaced by the value of the environment variable including all whitespace it contains, resulting in a single argument. Use "$FOO" as a separate word on the command line, in which case it will be replaced by the value of the environment variable split at whitespace, resulting in zero or more arguments. --- scripts/influxdb.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/influxdb.service b/scripts/influxdb.service index 6d2ef041ddc..25c2ffe9a43 100644 --- a/scripts/influxdb.service +++ b/scripts/influxdb.service @@ -10,7 +10,7 @@ User=influxdb Group=influxdb LimitNOFILE=65536 EnvironmentFile=-/etc/default/influxdb -ExecStart=/usr/bin/influxd -config /etc/influxdb/influxdb.conf ${INFLUXD_OPTS} +ExecStart=/usr/bin/influxd -config /etc/influxdb/influxdb.conf $INFLUXD_OPTS KillMode=control-group Restart=on-failure From 0aaede84214c1e001581b1f3a6044db84f3183d5 Mon Sep 17 00:00:00 2001 From: Mark Rushakoff Date: Tue, 3 Oct 2017 11:28:16 -0700 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b598db1dd15..f4b924757c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,7 @@ - [#8848](https://github.com/influxdata/influxdb/issues/8848): Prevent deadlock when doing math on the result of a subquery. - [#8895](https://github.com/influxdata/influxdb/issues/8895): Fix a minor memory leak in batching points in tsdb. - [#8900](https://github.com/influxdata/influxdb/issues/8900): Don't assume `which` is present in package post-install script. +- [#8909](https://github.com/influxdata/influxdb/issues/8909): Fix use of `INFLUXD_OPTS` in service file ## v1.3.4 [unreleased]