Skip to content

chore(NA): remove config arg from os packages #67871

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

Merged
mistic merged 3 commits into from
Jun 3, 2020
Merged

chore(NA): remove config arg from os packages #67871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc0b123
chore(NA): remove config arg from os packages
mistic Jun 1, 2020
27947d0
chore(NA): remove args from exec on init d
mistic Jun 2, 2020
9761696
Merge branch 'master' into remove-config-parameter-from-kibana-service
elasticmachine Jun 3, 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
2 changes: 1 addition & 1 deletion src/dev/build/tasks/os_packages/service_templates/systemd/etc/systemd/system/kibana.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Group=kibana
# exist, it continues onward.
EnvironmentFile=-/etc/default/kibana
EnvironmentFile=-/etc/sysconfig/kibana
ExecStart=/usr/share/kibana/bin/kibana "-c /etc/kibana/kibana.yml"
ExecStart=/usr/share/kibana/bin/kibana
Restart=on-failure
RestartSec=3
StartLimitBurst=3
Expand Down
3 changes: 1 addition & 2 deletions src/dev/build/tasks/os_packages/service_templates/sysv/etc/init.d/kibana
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

name=kibana
program=/usr/share/kibana/bin/kibana
args=-c\\\ /etc/kibana/kibana.yml
pidfile="/var/run/$name.pid"

[ -r /etc/default/$name ] && . /etc/default/$name
Expand Down Expand Up @@ -53,7 +52,7 @@ start() {
chroot --userspec "$user":"$group" "$chroot" sh -c "

cd \"$chdir\"
exec \"$program\" $args
exec \"$program\"
" >> /var/log/kibana/kibana.stdout 2>> /var/log/kibana/kibana.stderr &

# Generate the pidfile from here. If we instead made the forked process
Expand Down