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:
Suyog Rao 2016-04-25 22:54:44 -07:00
parent 9351d9fd87
commit 6de2251809

View file

@ -226,9 +226,6 @@ namespace "artifact" do
case platform
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|
dir.input("#{path}=/etc/logrotate.d/logstash")
end
@ -248,9 +245,6 @@ namespace "artifact" do
out.config_files << "etc/logrotate.d/logstash"
out.config_files << "/etc/init.d/logstash"
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|
dir.input("#{path}=/etc/default/logstash")
end
@ -315,7 +309,7 @@ namespace "artifact" do
out.attributes[:force?] = true # overwrite the rpm/deb/etc being created
begin
path = File.join(basedir, "build", out.to_s(package_filename))
path = File.join(basedir, "build", out.to_s)
x = out.output(path)
puts "Completed: #{path}"
ensure