logstash forwarder working. git install

rackspace-cookbooks · Feb 10, 2015 · 4106b75 · 4106b75
1 parent 1fe2ff6
commit 4106b75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/files/default/logstash-forwarder-init-rhel → files/default/logstash-forwarder-init b/files/default/logstash-forwarder-init-rhel → files/default/logstash-forwarder-init
diff --git a/recipes/forwarder.rb b/recipes/forwarder.rb
@@ -44,25 +44,20 @@
   action :checkout
 end
 
-execute "build_logstash_forwarder" do
+execute 'build_logstash_forwarder' do
   cwd node['logstash_forwarder']['app_dir']
   command '/usr/local/go/bin/go build'
   action :run
-  user "root"
-  group "root"
-  not_if do ::File.exists?("#{node['logstash_forwarder']['app_dir']}/logstash-forwarder") end
+  user 'root'
+  group 'root'
+  not_if { ::File.exist?("#{node['logstash_forwarder']['app_dir']}/logstash-forwarder") }
 end
 
-case node['platform_family']
-when 'debian'
-
-when 'rhel'
-  cookbook_file '/etc/init.d/logstash-forwarder' do
-    source 'logstash-forwarder-init-rhel'
-    owner 'root' # init script must be root, not user/group configured
-    group 'root'
-    mode 0755
-  end
+cookbook_file '/etc/init.d/logstash-forwarder' do
+  source 'logstash-forwarder-init'
+  owner 'root' # init script must be root, not user/group configured
+  group 'root'
+  mode 0755
 end
 
 require 'json'

diff --git a/test/integration/forwarder/serverspec/default_spec.rb b/test/integration/forwarder/serverspec/default_spec.rb
@@ -9,7 +9,7 @@
 describe 'logstash-forwarder service' do
   # can't use process() matcher because of two java processes
   describe 'should be running Logstash main class' do
-    describe command('ps aux | grep -v grep | grep -s /opt/logstash-forwarder/bin/logstash-forwarder') do
+    describe command('ps aux | grep -v grep | grep -s /opt/logstash-forwarder/logstash-forwarder') do
       its(:exit_status) { should eq 0 }
     end
   end