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.

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

Backport PR #13922 to 8.2: Removal of sys-v init.d scripts #13954

Merged
merged 1 commit into from
Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion qa/config/platforms.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"ubuntu-1604": { "box": "elastic/ubuntu-16.04-x86_64", "type": "debian" },
"ubuntu-1804": { "box": "elastic/ubuntu-18.04-x86_64", "type": "debian" },
"centos-7": { "box": "elastic/centos-7-x86_64", "type": "redhat" },
"oel-6": { "box": "elastic/oraclelinux-6-x86_64", "type": "redhat" },
"oel-7": { "box": "elastic/oraclelinux-7-x86_64", "type": "redhat" },
"fedora-28": { "box": "elastic/fedora-28-x86_64", "type": "redhat", "experimental": true },
"fedora-29": { "box": "elastic/fedora-29-x86_64", "type": "redhat", "experimental": true },
Expand Down
6 changes: 0 additions & 6 deletions rakelib/artifacts.rake
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ namespace "artifact" do
dir.input("#{empty}/=/var/lib/logstash")
dir.input("#{empty}/=/etc/logstash/conf.d")
dir.input("#{empty}/=/lib/systemd/system")
dir.input("#{empty}/=/etc/init.d/")
dir.input("#{empty}/=/etc/default")
end

Expand Down Expand Up @@ -587,9 +586,6 @@ namespace "artifact" do
File.join(basedir, "pkg", "service_templates", "systemd", "lib", "systemd", "system", "logstash.service").tap do |path|
dir.input("#{path}=/lib/systemd/system")
end
File.join(basedir, "pkg", "service_templates", "sysv", "etc", "init.d", "logstash").tap do |path|
dir.input("#{path}=/etc/init.d")
end
File.join(basedir, "pkg", "service_templates", "sysv", "etc", "default", "logstash").tap do |path|
dir.input("#{path}=/etc/default")
end
Expand All @@ -614,7 +610,6 @@ namespace "artifact" do
out.config_files << "/etc/logstash/logstash-sample.conf"
out.config_files << "/etc/logstash/pipelines.yml"
out.config_files << "/lib/systemd/system/logstash.service"
out.config_files << "/etc/init.d/logstash"
out.config_files << "/etc/default/logstash"
when "debian", "ubuntu"
require "fpm/package/deb"
Expand All @@ -633,7 +628,6 @@ namespace "artifact" do
out.config_files << "/etc/logstash/logstash-sample.conf"
out.config_files << "/etc/logstash/pipelines.yml"
out.config_files << "/lib/systemd/system/logstash.service"
out.config_files << "/etc/init.d/logstash"
out.config_files << "/etc/default/logstash"
end

Expand Down