Skip to content

Commit

Permalink
Cherry-pick elastic#4797 to 6.0: Update init scripts to use "test con…
Browse files Browse the repository at this point in the history
…fig" subcommand (elastic#4994)

* Update init scripts to use "test config" subcommand (elastic#4797)

Using "-configtest" is deprecated and the "[beat] test config" subcommand should be used instead.

Fixes elastic#4600

(cherry picked from commit ee33cf1)
  • Loading branch information
tsg authored and andrewkroh committed Aug 24, 2017
1 parent 843f873 commit 950ae14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dev-tools/packer/platforms/centos/init.j2
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PATH
pidfile=${PIDFILE-/var/run/{{.beat_pkg_name}}.pid}
agent=${BEATS_AGENT-/usr/share/{{.beat_name}}/bin/{{.beat_name}}}
args="-c /etc/{{.beat_name}}/{{.beat_name}}.yml -path.home /usr/share/{{.beat_name}} -path.config /etc/{{.beat_name}} -path.data /var/lib/{{.beat_name}} -path.logs /var/log/{{.beat_name}}"
test_args="-e -configtest"
test_args="-e test config"
beat_user="${BEAT_USER:-root}"
wrapper="/usr/share/{{.beat_name}}/bin/{{.beat_name}}-god"
wrapperopts="-r / -n -p $pidfile"
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packer/platforms/debian/init.j2
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DESC="{{.beat_description}}"
NAME="{{.beat_name}}"
DAEMON=/usr/share/{{.beat_name}}/bin/$NAME
DAEMON_ARGS="-c /etc/{{.beat_name}}/{{.beat_name}}.yml -path.home /usr/share/{{.beat_name}} -path.config /etc/{{.beat_name}} -path.data /var/lib/{{.beat_name}} -path.logs /var/log/{{.beat_name}}"
TEST_ARGS="-e -configtest"
TEST_ARGS="-e test config"
PIDFILE=/var/run/{{.beat_pkg_name}}.pid
WRAPPER="/usr/share/{{.beat_name}}/bin/{{.beat_name}}-god"
BEAT_USER="root"
Expand Down

0 comments on commit 950ae14

Please sign in to comment.