From 950ae14fec70163cdbb627bfa29ac0e46518fb94 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Thu, 24 Aug 2017 19:27:52 +0200 Subject: [PATCH] Cherry-pick #4797 to 6.0: Update init scripts to use "test config" subcommand (#4994) * Update init scripts to use "test config" subcommand (#4797) Using "-configtest" is deprecated and the "[beat] test config" subcommand should be used instead. Fixes #4600 (cherry picked from commit ee33cf14d56b3b441e3cab33b522047989148117) --- dev-tools/packer/platforms/centos/init.j2 | 2 +- dev-tools/packer/platforms/debian/init.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/packer/platforms/centos/init.j2 b/dev-tools/packer/platforms/centos/init.j2 index ea5d58c6f90..f713575539e 100755 --- a/dev-tools/packer/platforms/centos/init.j2 +++ b/dev-tools/packer/platforms/centos/init.j2 @@ -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" diff --git a/dev-tools/packer/platforms/debian/init.j2 b/dev-tools/packer/platforms/debian/init.j2 index 5ffab16d9c2..04c24242d81 100755 --- a/dev-tools/packer/platforms/debian/init.j2 +++ b/dev-tools/packer/platforms/debian/init.j2 @@ -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"