Revert "Limit the memory used by renderd"

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index dfb6864c5acf180bcaae39bfb18a8fb467609abe..abfacb6502aed111dbfed4fcc005ac1bb370d934 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -17,12 +17,17 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :service, String, :name_property => true
 property :dropin, String
 property :description, String
 default_action :create
 
 property :service, String, :name_property => true
 property :dropin, String
 property :description, String

+property :condition_path_exists, [String, Array]
+property :condition_path_exists_glob, [String, Array]

 property :after, [String, Array]
 property :after, [String, Array]

+property :conflicts, [String, Array]

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


@@ -52,13 +57,16 @@ property :standard_error, String,
 property :success_exit_status, [Integer, String, Array]
 property :restart, String,
          :is => %w[on-success on-failure on-abnormal on-watchdog on-abort always]
 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]
-property :private_devices, [TrueClass, FalseClass]
-property :private_network, [TrueClass, FalseClass]
+property :private_tmp, [true, false]
+property :private_devices, [true, false]
+property :private_network, [true, false]

 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]

+property :read_write_paths, [String, Array]
+property :read_only_paths, [String, Array]
+property :inaccessible_paths, [String, Array]

 property :restrict_address_families, [String, Array]
 property :restrict_address_families, [String, Array]

-property :no_new_privileges, [TrueClass, FalseClass]
+property :no_new_privileges, [true, false]

 property :tasks_max, Integer
 property :timeout_sec, Integer
 property :pid_file, String
 property :tasks_max, Integer
 property :timeout_sec, Integer
 property :pid_file, String


@@ -81,7 +89,7 @@ action :create do
       source "environment.erb"
       owner "root"
       group "root"
       source "environment.erb"
       owner "root"
       group "root"

-      mode 0o640
+      mode "640"

       variables :environment => new_resource.environment_file
     end
 
       variables :environment => new_resource.environment_file
     end
 


@@ -92,7 +100,7 @@ action :create do
     directory dropin_directory do
       owner "root"
       group "root"
     directory dropin_directory do
       owner "root"
       group "root"

-      mode 0o755
+      mode "755"

     end
   end
 
     end
   end
 


@@ -101,7 +109,7 @@ action :create do
     source "service.erb"
     owner "root"
     group "root"
     source "service.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables service_variables
     notifies :run, "execute[systemctl-reload]"
   end
     variables service_variables
     notifies :run, "execute[systemctl-reload]"
   end