From 6f73da41a94c80f50430cb44f77465f5797a5329 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 Dec 2018 20:07:41 -0500 Subject: [PATCH] Switch from admin systemd location to vendor (#27768) --- src/dev/build/tasks/os_packages/run_fpm.js | 5 +++-- .../systemd/{etc => lib}/systemd/system/kibana.service | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename src/dev/build/tasks/os_packages/service_templates/systemd/{etc => lib}/systemd/system/kibana.service (100%) diff --git a/src/dev/build/tasks/os_packages/run_fpm.js b/src/dev/build/tasks/os_packages/run_fpm.js index cb3c560d6725a..a47f91d905e35 100644 --- a/src/dev/build/tasks/os_packages/run_fpm.js +++ b/src/dev/build/tasks/os_packages/run_fpm.js @@ -113,9 +113,10 @@ export async function runFpm(config, log, build, type, pkgSpecificFlags) { // copy the data directory at /var/lib/kibana `${resolveWithTrailingSlash(fromBuild('data'))}=/var/lib/kibana/`, - // copy the generated pleaserun services for systemd and sysv into /etc/ + // copy the generated pleaserun services for sysv into /etc/ `${resolveWithTrailingSlash(__dirname, 'service_templates/sysv/etc')}=/etc/`, - `${resolveWithTrailingSlash(__dirname, 'service_templates/systemd/etc')}=/etc/`, + // copy the generated pleaserun services for systemd into /lib/ + `${resolveWithTrailingSlash(__dirname, 'service_templates/systemd/lib')}=/lib/`, ]; log.debug('calling fpm with args:', args); diff --git a/src/dev/build/tasks/os_packages/service_templates/systemd/etc/systemd/system/kibana.service b/src/dev/build/tasks/os_packages/service_templates/systemd/lib/systemd/system/kibana.service similarity index 100% rename from src/dev/build/tasks/os_packages/service_templates/systemd/etc/systemd/system/kibana.service rename to src/dev/build/tasks/os_packages/service_templates/systemd/lib/systemd/system/kibana.service