dhcp: Only use first ntp server in DHCP replies

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index e6fba41b514779d07733d8a0ce1cd37d71d44626..c2d125b1884a3adccabdcb8daf54f153b46b70d5 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,53 +19,98 @@
 
 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 :description, String, :required => true
 property :after, [String, Array]

+property :wants, [String, Array]

 property :type, String,
          :default => "simple",
 property :type, String,
          :default => "simple",

-         :is => %w(simple forking oneshot dbus notify idle)
-property :limit_nofile, Fixnum
+         :is => %w[simple forking oneshot dbus notify idle]
+property :limit_nofile, Integer
+property :limit_as, [Integer, String]
+property :limit_cpu, [Integer, String]
+property :memory_low, [Integer, String]
+property :memory_high, [Integer, String]
+property :memory_max, [Integer, String]

 property :environment, Hash, :default => {}
 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 :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,
 property :restart, String,

-         :is => %w(on-success on-failure on-abnormal on-watchdog on-abort always)
-property :timeout_sec, Fixnum
+         :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 :no_new_privileges, [TrueClass, FalseClass]
+property :timeout_sec, Integer
+property :pid_file, String

 
 action :create do
 
 action :create do

-  template "/etc/systemd/system/#{name}.service" do
+  service_variables = new_resource.to_hash
+
+  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
+      variables :environment => new_resource.environment_file
+    end
+
+    service_variables[:environment_file] = "/etc/default/#{new_resource.service}"
+  end
+
+  template "/etc/systemd/system/#{new_resource.service}.service" do

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

-    mode 0644
-    variables new_resource.to_hash
+    mode 0o644
+    variables service_variables

   end
 
   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/systemd/system/#{name}.service" do
+  file "/etc/default/#{new_resource.service}" do
+    action :delete
+    only_if { new_resource.environment_file.is_a?(Hash) }
+  end
+
+  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