diff --git a/libraries/logstash_util.rb b/libraries/logstash_util.rb index 3461526..3832f4f 100644 --- a/libraries/logstash_util.rb +++ b/libraries/logstash_util.rb @@ -52,7 +52,7 @@ def self.determine_native_init(node) end when 'redhat', 'centos', 'scientific' if platform_major_version <= 6 - 'sysvinit' + File.exist?('/sbin/start') ? 'upstart' : 'sysvinit' else 'systemd' end diff --git a/metadata.rb b/metadata.rb index 12a5116..4920176 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,7 +6,7 @@ description 'Installs/Configures logstash' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '1.0.0' +version '1.0.1' %w(ubuntu debian redhat centos scientific amazon fedora).each do |os| supports os diff --git a/test/unit/spec/util_spec.rb b/test/unit/spec/util_spec.rb index 0107345..1ae9882 100644 --- a/test/unit/spec/util_spec.rb +++ b/test/unit/spec/util_spec.rb @@ -80,8 +80,9 @@ end context 'with 6' do let(:node) { { 'platform' => 'centos', 'platform_version' => '6' } } - it 'returns sysvinit' do - expect(Logstash.determine_native_init(node)).to eql('sysvinit') + it 'returns upstart' do + allow(File).to receive(:exist?).with('/sbin/start').and_return(true) + expect(Logstash.determine_native_init(node)).to eql('upstart') end end context 'with 7' do