chore(NA): use env var to point config folder on os_packages built wi…

…th fpm (#67433) (#67813) Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
elastic · May 30, 2020 · ef0b82d · ef0b82d
1 parent 3aa3a9b
commit ef0b82d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/core/server/path/index.ts b/src/core/server/path/index.ts
@@ -28,7 +28,6 @@ const CONFIG_PATHS = [
   process.env.KIBANA_PATH_CONF && join(process.env.KIBANA_PATH_CONF, 'kibana.yml'),
   process.env.CONFIG_PATH, // deprecated
   fromRoot('config/kibana.yml'),
-  '/etc/kibana/kibana.yml',
 ].filter(isString);
 
 const DATA_PATHS = [

diff --git a/src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana b/src/dev/build/tasks/os_packages/service_templates/sysv/etc/default/kibana
@@ -11,3 +11,5 @@ nice=""
 KILL_ON_STOP_TIMEOUT=0
 
 BABEL_CACHE_PATH="/var/lib/kibana/optimize/.babel_register_cache.json"
+
+KIBANA_PATH_CONF="/etc/kibana"
diff --git a/src/dev/build/tasks/os_packages/service_templates/sysv/etc/init.d/kibana b/src/dev/build/tasks/os_packages/service_templates/sysv/etc/init.d/kibana
@@ -23,6 +23,7 @@ pidfile="/var/run/$name.pid"
 [ -r /etc/default/$name ] && . /etc/default/$name
 [ -r /etc/sysconfig/$name ] && . /etc/sysconfig/$name
 
+export KIBANA_PATH_CONF
 export NODE_OPTIONS
 
 [ -z "$nice" ] && nice=0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@ nice=""
		KILL_ON_STOP_TIMEOUT=0

		BABEL_CACHE_PATH="/var/lib/kibana/optimize/.babel_register_cache.json"

		KIBANA_PATH_CONF="/etc/kibana"