Treat an exit status of 3 as success for chef-client

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 6221441018593e8eb04ee5add96ac10804caaec3..664304da8d6e07c51fbac1ee1b01683f12936f94 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -26,22 +26,26 @@ property :wants, [String, Array]
 property :type, String,
          :default => "simple",
          :is => %w(simple forking oneshot dbus notify idle)
-property :limit_nofile, Fixnum
+property :limit_nofile, Integer
 property :environment, Hash, :default => {}
-property :environment_file, String
+property :environment_file, [String, Hash]
 property :user, String
 property :group, String
+property :working_directory, String
 property :exec_start_pre, String
 property :exec_start, String, :required => true
 property :exec_start_post, String
 property :exec_stop, String
 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)
 property :standard_output, String,
          :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)
+property :success_exit_status, [Integer, String, Array]
 property :restart, String,
          :is => %w(on-success on-failure on-abnormal on-watchdog on-abort always)
 property :private_tmp, [TrueClass, FalseClass]
@@ -49,17 +53,33 @@ property :private_devices, [TrueClass, FalseClass]
 property :private_network, [TrueClass, FalseClass]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
-property :timeout_sec, Fixnum
+property :no_new_privileges, [TrueClass, FalseClass]
+property :timeout_sec, Integer
 property :pid_file, String
 
 action :create do
+  service_variables = new_resource.to_hash
+
+  if environment_file.is_a?(Hash)
+    template "/etc/default/#{name}" do
+      cookbook "systemd"
+      source "environment.erb"
+      owner "root"
+      group "root"
+      mode 0o640
+      variables :environment => environment_file
+    end
+
+    service_variables[:environment_file] = "/etc/default/#{name}"
+  end
+
   template "/etc/systemd/system/#{name}.service" do
     cookbook "systemd"
     source "service.erb"
     owner "root"
     group "root"
     mode 0o644
-    variables new_resource.to_hash
+    variables service_variables
   end
 
   execute "systemctl-reload-#{name}.service" do
@@ -72,6 +92,11 @@ action :create do
 end
 
 action :delete do
+  file "/etc/default/#{name}" do
+    action :delete
+    only_if { environment_file.is_a?(Hash) }
+  end
+
   file "/etc/systemd/system/#{name}.service" do
     action :delete
   end