Fix foodcritic warnings

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 2a8f22b2b30547805e47869d2d558f418f58e1a3..87dd05486d690e3491659bbd4aab53394980acdc 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -19,13 +19,13 @@
 
 default_action :create
 
-property :name, String
+property :service, String, :name_property => true
 property :description, String, :required => true
 property :after, [String, Array]
 property :wants, [String, Array]
 property :type, String,
          :default => "simple",
-         :is => %w(simple forking oneshot dbus notify idle)
+         :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer
 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
@@ -40,13 +40,14 @@ property :exec_reload, String
 property :runtime_directory, String
 property :runtime_directory_mode, Integer
 property :standard_input, String,
-         :is => %w(null tty tty-force tty-fail socket)
+         :is => %w[null tty tty-force tty-fail socket]
 property :standard_output, String,
-         :is => %w(inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket)
+         :is => %w[inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket]
 property :standard_error, String,
-         :is => %w(inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket)
+         :is => %w[inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket]
+property :success_exit_status, [Integer, String, Array]
 property :restart, String,
-         :is => %w(on-success on-failure on-abnormal on-watchdog on-abort always)
+         :is => %w[on-success on-failure on-abnormal on-watchdog on-abort always]
 property :private_tmp, [TrueClass, FalseClass]
 property :private_devices, [TrueClass, FalseClass]
 property :private_network, [TrueClass, FalseClass]
@@ -60,7 +61,7 @@ action :create do
   service_variables = new_resource.to_hash
 
   if environment_file.is_a?(Hash)
-    template "/etc/default/#{name}" do
+    template "/etc/default/#{service}" do
       cookbook "systemd"
       source "environment.erb"
       owner "root"
@@ -69,10 +70,10 @@ action :create do
       variables :environment => environment_file
     end
 
-    service_variables[:environment_file] = "/etc/default/#{name}"
+    service_variables[:environment_file] = "/etc/default/#{service}"
   end
 
-  template "/etc/systemd/system/#{name}.service" do
+  template "/etc/systemd/system/#{service}.service" do
     cookbook "systemd"
     source "service.erb"
     owner "root"
@@ -81,30 +82,30 @@ action :create do
     variables service_variables
   end
 
-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload-#{service}.service" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "template[/etc/systemd/system/#{name}.service]"
+    subscribes :run, "template[/etc/systemd/system/#{service}.service]"
   end
 end
 
 action :delete do
-  file "/etc/default/#{name}" do
+  file "/etc/default/#{service}" do
     action :delete
     only_if { environment_file.is_a?(Hash) }
   end
 
-  file "/etc/systemd/system/#{name}.service" do
+  file "/etc/systemd/system/#{service}.service" do
     action :delete
   end
 
-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload-#{service}.service" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "file[/etc/systemd/system/#{name}.service]"
+    subscribes :run, "file[/etc/systemd/system/#{service}.service]"
   end
 end