Switch to use filebeat for forwarding to logstash

[chef.git] / cookbooks / systemd / resources / service.rb

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 87dd05486d690e3491659bbd4aab53394980acdc..eff763f32df6e9ba505cf79ed640bd67b96c96fc 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -60,20 +60,20 @@ property :pid_file, String
 action :create do
   service_variables = new_resource.to_hash
 
 action :create do
   service_variables = new_resource.to_hash
 

-  if environment_file.is_a?(Hash)
-    template "/etc/default/#{service}" do
+  if new_resource.environment_file.is_a?(Hash)
+    template "/etc/default/#{new_resource.service}" do

       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
       mode 0o640
       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
       mode 0o640

-      variables :environment => environment_file
+      variables :environment => new_resource.environment_file

     end
 
     end
 

-    service_variables[:environment_file] = "/etc/default/#{service}"
+    service_variables[:environment_file] = "/etc/default/#{new_resource.service}"

   end
 
   end
 

-  template "/etc/systemd/system/#{service}.service" do
+  template "/etc/systemd/system/#{new_resource.service}.service" do

     cookbook "systemd"
     source "service.erb"
     owner "root"
     cookbook "systemd"
     source "service.erb"
     owner "root"


@@ -82,30 +82,30 @@ action :create do
     variables service_variables
   end
 
     variables service_variables
   end
 

-  execute "systemctl-reload-#{service}.service" do
+  execute "systemctl-reload-#{new_resource.service}.service" do

     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"

-    subscribes :run, "template[/etc/systemd/system/#{service}.service]"
+    subscribes :run, "template[/etc/systemd/system/#{new_resource.service}.service]"

   end
 end
 
 action :delete do
   end
 end
 
 action :delete do

-  file "/etc/default/#{service}" do
+  file "/etc/default/#{new_resource.service}" do

     action :delete
     only_if { environment_file.is_a?(Hash) }
   end
 
     action :delete
     only_if { environment_file.is_a?(Hash) }
   end
 

-  file "/etc/systemd/system/#{service}.service" do
+  file "/etc/systemd/system/#{new_resource.service}.service" do

     action :delete
   end
 
     action :delete
   end
 

-  execute "systemctl-reload-#{service}.service" do
+  execute "systemctl-reload-#{new_resource.service}.service" do

     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"

-    subscribes :run, "file[/etc/systemd/system/#{service}.service]"
+    subscribes :run, "file[/etc/systemd/system/#{new_resource.service}.service]"

   end
 end
   end
 end