Don't expire connection limit sets

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index ef7c86d760cc76daa0e4e1bc5e58a72b9e7dcd4d..35655dc7a500a76d1a9a2b33845b45e369de1b0d 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]


@@ -40,11 +43,13 @@ property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String
 property :group, String
 property :environment_file, [String, Hash]
 property :user, String
 property :group, String

+property :dynamic_user, [true, false]

 property :working_directory, String
 property :exec_start_pre, [String, Array]
 property :exec_start, [String, Array]
 property :exec_start_post, [String, Array]
 property :working_directory, String
 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 :runtime_directory, String
 property :runtime_directory_mode, Integer
 property :exec_reload, String
 property :runtime_directory, String
 property :runtime_directory_mode, Integer


@@ -127,7 +132,7 @@ action :create do
     service_variables[:protect_kernel_modules] = true unless property_is_set?(:protect_kernel_modules)
     service_variables[:protect_kernel_logs] = true unless property_is_set?(:protect_kernel_logs)
     service_variables[:protect_control_groups] = true unless property_is_set?(:protect_control_groups)
     service_variables[:protect_kernel_modules] = true unless property_is_set?(:protect_kernel_modules)
     service_variables[:protect_kernel_logs] = true unless property_is_set?(:protect_kernel_logs)
     service_variables[:protect_control_groups] = true unless property_is_set?(:protect_control_groups)

-    service_variables[:restrict_address_families] = "none" unless property_is_set?(:restrict_address_families)
+    service_variables[:restrict_address_families] = [] unless property_is_set?(:restrict_address_families)

     service_variables[:restrict_namespaces] = true unless property_is_set?(:restrict_namespaces)
     service_variables[:lock_personality] = true unless property_is_set?(:lock_personality)
     service_variables[:memory_deny_write_execute] = true unless property_is_set?(:memory_deny_write_execute)
     service_variables[:restrict_namespaces] = true unless property_is_set?(:restrict_namespaces)
     service_variables[:lock_personality] = true unless property_is_set?(:lock_personality)
     service_variables[:memory_deny_write_execute] = true unless property_is_set?(:memory_deny_write_execute)