Merge remote-tracking branch 'github/pull/637'

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 662528c2b81f47e417a08c2fafb83302c92f44aa..b8a58a88f1c9e8d8ff93e91a5621072bf48cff2c 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -29,7 +29,10 @@ property :condition_path_exists_glob, [String, Array]
 property :after, [String, Array]
 property :conflicts, [String, Array]
 property :wants, [String, Array]
 property :after, [String, Array]
 property :conflicts, [String, Array]
 property :wants, [String, Array]

+property :requires, [String, Array]
+property :joins_namespace_of, [String, Array]

 property :type, String, :is => %w[simple forking oneshot dbus notify idle]
 property :type, String, :is => %w[simple forking oneshot dbus notify idle]

+property :notify_access, String, :is => %w[none main exec all]

 property :limit_nofile, Integer
 property :limit_as, [Integer, String]
 property :limit_cpu, [Integer, String]
 property :limit_nofile, Integer
 property :limit_as, [Integer, String]
 property :limit_cpu, [Integer, String]


@@ -45,11 +48,20 @@ property :working_directory, String
 property :exec_start_pre, [String, Array]
 property :exec_start, [String, Array]
 property :exec_start_post, [String, Array]
 property :exec_start_pre, [String, Array]
 property :exec_start, [String, Array]
 property :exec_start_post, [String, Array]

-property :exec_stop, String
+property :exec_stop, [String, Array]
+property :exec_stop_post, [String, Array]

 property :exec_reload, String
 property :exec_reload, String

+property :runtime_max_sec, Integer

 property :runtime_directory, String
 property :runtime_directory_mode, Integer
 property :runtime_directory, String
 property :runtime_directory_mode, Integer

-property :runtime_max_sec, Integer
+property :state_directory, String
+property :state_directory_mode, Integer
+property :cache_directory, String
+property :cache_directory_mode, Integer
+property :logs_directory, String
+property :logs_directory_mode, Integer
+property :configuration_directory, String
+property :configuration_directory_mode, Integer

 property :standard_input, String,
          :is => %w[null tty tty-force tty-fail socket]
 property :standard_output, String,
 property :standard_input, String,
          :is => %w[null tty tty-force tty-fail socket]
 property :standard_output, String,


@@ -63,7 +75,10 @@ property :protect_proc, String,
          :is => %w[noaccess invisible ptraceable default]
 property :proc_subset, String,
          :is => %w[all pid]
          :is => %w[noaccess invisible ptraceable default]
 property :proc_subset, String,
          :is => %w[all pid]

+property :bind_paths, [String, Array]
+property :bind_read_only_paths, [String, Array]

 property :capability_bounding_set, [String, Array]
 property :capability_bounding_set, [String, Array]

+property :ambient_capabilities, [String, Array]

 property :no_new_privileges, [true, false]
 property :protect_system, [true, false, String]
 property :protect_home, [true, false, String]
 property :no_new_privileges, [true, false]
 property :protect_system, [true, false, String]
 property :protect_home, [true, false, String]


@@ -114,6 +129,7 @@ action :create do
     service_variables[:protect_proc] = "invisible" unless property_is_set?(:protect_proc)
     service_variables[:proc_subset] = "pid" unless property_is_set?(:proc_subset)
     service_variables[:capability_bounding_set] = [] unless property_is_set?(:capability_bounding_set)
     service_variables[:protect_proc] = "invisible" unless property_is_set?(:protect_proc)
     service_variables[:proc_subset] = "pid" unless property_is_set?(:proc_subset)
     service_variables[:capability_bounding_set] = [] unless property_is_set?(:capability_bounding_set)

+    service_variables[:ambient_capabilities] = [] unless property_is_set?(:ambient_capabilities)

     service_variables[:no_new_privileges] = true unless property_is_set?(:no_new_privileges)
     service_variables[:protect_system] = "strict" unless property_is_set?(:protect_system)
     service_variables[:protect_home] = true unless property_is_set?(:protect_home)
     service_variables[:no_new_privileges] = true unless property_is_set?(:no_new_privileges)
     service_variables[:protect_system] = "strict" unless property_is_set?(:protect_system)
     service_variables[:protect_home] = true unless property_is_set?(:protect_home)