Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rpm] Create default environment file at "/etc/sysconfig/kibana" #82144

Merged
merged 8 commits into from
Nov 17, 2020
Merged

[rpm] Create default environment file at "/etc/sysconfig/kibana" #82144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cd1a5e
[rpm] Create default environment file at "/etc/sysconfig/kibana" instead
jbudz Oct 30, 2020
bf47510
fix lint error
jbudz Oct 30, 2020
7368b90
Merge branch 'master' into os/mv-rpm-etc-sysconfig
kibanamachine Nov 2, 2020
dbd77e7
Merge branch 'master' into os/mv-rpm-etc-sysconfig
kibanamachine Nov 4, 2020
f3655d7
Merge branch 'master' into os/mv-rpm-etc-sysconfig
kibanamachine Nov 6, 2020
c7fe34e
Merge branch 'master' into os/mv-rpm-etc-sysconfig
kibanamachine Nov 9, 2020
5e312f6
Merge branch 'master' into os/mv-rpm-etc-sysconfig
jbudz Nov 11, 2020
0e021f1
Merge branch 'master' into os/mv-rpm-etc-sysconfig
kibanamachine Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/dev/build/tasks/os_packages/run_fpm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ export async function runFpm(
}
};

const envFolder = type === 'rpm' ? 'sysconfig' : 'default';

const args = [
// Force output even if it will overwrite an existing file
'--force',
Expand Down Expand Up @@ -136,6 +138,11 @@ export async function runFpm(

// copy package configurations
`${resolveWithTrailingSlash(__dirname, 'service_templates/systemd/')}=/`,

`${resolveWithTrailingSlash(
__dirname,
'service_templates/env/kibana'
)}=/etc/${envFolder}/kibana`,
];

log.debug('calling fpm with args:', args);
Expand Down
0 ...vice_templates/systemd/etc/default/kibana → .../os_packages/service_templates/env/kibana
View file
Open in desktop
File renamed without changes.