Include WB items in regular search results by dflt

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 943ce031bbc8ae3f166770d2b499f5eb97d606c1..772999f1d81c1e624bcbb6b79633f72246f7aff0 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,18 +19,22 @@
 
 default_action :create
 
 
 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",
 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 :limit_nofile, Integer

+property :memory_low, [Integer, String]
+property :memory_high, [Integer, String]
+property :memory_max, [Integer, String]

 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String
 property :group, String
 property :environment, Hash, :default => {}
 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_start_pre, String
 property :exec_start, String, :required => true
 property :exec_start_post, String


@@ -39,38 +43,40 @@ property :exec_reload, String
 property :runtime_directory, String
 property :runtime_directory_mode, Integer
 property :standard_input, 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,
 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,
 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,
 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]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
 property :private_tmp, [TrueClass, FalseClass]
 property :private_devices, [TrueClass, FalseClass]
 property :private_network, [TrueClass, FalseClass]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]

+property :no_new_privileges, [TrueClass, FalseClass]

 property :timeout_sec, Integer
 property :pid_file, String
 
 action :create do
   service_variables = new_resource.to_hash
 
 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
+  if new_resource.environment_file.is_a?(Hash)
+    template "/etc/default/#{new_resource.service}" do

       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
       mode 0o640
       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
       mode 0o640

-      variables :environment => environment_file
+      variables :environment => new_resource.environment_file

     end
 
     end
 

-    service_variables[:environment_file] = "/etc/default/#{name}"
+    service_variables[:environment_file] = "/etc/default/#{new_resource.service}"

   end
 
   end
 

-  template "/etc/systemd/system/#{name}.service" do
+  template "/etc/systemd/system/#{new_resource.service}.service" do

     cookbook "systemd"
     source "service.erb"
     owner "root"
     cookbook "systemd"
     source "service.erb"
     owner "root"


@@ -79,30 +85,30 @@ action :create do
     variables service_variables
   end
 
     variables service_variables
   end
 

-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload-#{new_resource.service}.service" do

     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"

-    subscribes :run, "template[/etc/systemd/system/#{name}.service]"
+    subscribes :run, "template[/etc/systemd/system/#{new_resource.service}.service]"

   end
 end
 
 action :delete do
   end
 end
 
 action :delete do

-  file "/etc/default/#{name}" do
+  file "/etc/default/#{new_resource.service}" do

     action :delete
     action :delete

-    only_if { environment_file.is_a?(Hash) }
+    only_if { new_resource.environment_file.is_a?(Hash) }

   end
 
   end
 

-  file "/etc/systemd/system/#{name}.service" do
+  file "/etc/systemd/system/#{new_resource.service}.service" do

     action :delete
   end
 
     action :delete
   end
 

-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload-#{new_resource.service}.service" do

     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"

-    subscribes :run, "file[/etc/systemd/system/#{name}.service]"
+    subscribes :run, "file[/etc/systemd/system/#{new_resource.service}.service]"

   end
 end
   end
 end