mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 14:47:19 -04:00
Revert #5125 from 2.3
Some users may have scripted the download location, so I don't feel right in breaking this name in a minor version. This change should be documented as breaking, IMO
This commit is contained in:
parent
9351d9fd87
commit
6de2251809
1 changed files with 1 additions and 7 deletions
|
@ -226,9 +226,6 @@ namespace "artifact" do
|
||||||
|
|
||||||
case platform
|
case platform
|
||||||
when "redhat", "centos"
|
when "redhat", "centos"
|
||||||
# produce: logstash-5.0.0-alpha1.noarch.rpm
|
|
||||||
package_filename = "logstash-#{LOGSTASH_VERSION}.ARCH.TYPE"
|
|
||||||
|
|
||||||
File.join(basedir, "pkg", "logrotate.conf").tap do |path|
|
File.join(basedir, "pkg", "logrotate.conf").tap do |path|
|
||||||
dir.input("#{path}=/etc/logrotate.d/logstash")
|
dir.input("#{path}=/etc/logrotate.d/logstash")
|
||||||
end
|
end
|
||||||
|
@ -248,9 +245,6 @@ namespace "artifact" do
|
||||||
out.config_files << "etc/logrotate.d/logstash"
|
out.config_files << "etc/logrotate.d/logstash"
|
||||||
out.config_files << "/etc/init.d/logstash"
|
out.config_files << "/etc/init.d/logstash"
|
||||||
when "debian", "ubuntu"
|
when "debian", "ubuntu"
|
||||||
# produce: logstash-5.0.0-alpha1_all.deb"
|
|
||||||
package_filename = "logstash-#{LOGSTASH_VERSION}_ARCH.TYPE"
|
|
||||||
|
|
||||||
File.join(basedir, "pkg", "logstash.default").tap do |path|
|
File.join(basedir, "pkg", "logstash.default").tap do |path|
|
||||||
dir.input("#{path}=/etc/default/logstash")
|
dir.input("#{path}=/etc/default/logstash")
|
||||||
end
|
end
|
||||||
|
@ -315,7 +309,7 @@ namespace "artifact" do
|
||||||
|
|
||||||
out.attributes[:force?] = true # overwrite the rpm/deb/etc being created
|
out.attributes[:force?] = true # overwrite the rpm/deb/etc being created
|
||||||
begin
|
begin
|
||||||
path = File.join(basedir, "build", out.to_s(package_filename))
|
path = File.join(basedir, "build", out.to_s)
|
||||||
x = out.output(path)
|
x = out.output(path)
|
||||||
puts "Completed: #{path}"
|
puts "Completed: #{path}"
|
||||||
ensure
|
ensure
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue