Add planet role to horntail and norbert

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 62641291ad606d601c4d2e23e50405bdbe9067b7..4b53051d39c176364d13f3d2bf8794303f4aa25e 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: systemd
+# Cookbook:: systemd

 # Resource:: systemd_service
 #
 # Resource:: systemd_service
 #

-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,


@@ -17,28 +17,38 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

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

-property :description, String, :required => 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 :wants, [String, Array]

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

 property :limit_nofile, Integer
 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_file, [String, Hash]
 property :user, String
 property :group, String
 property :working_directory, String
 property :exec_start_pre, 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, String

 property :exec_start_post, String
 property :exec_stop, String
 property :exec_reload, String
 property :runtime_directory, String
 property :runtime_directory_mode, Integer
 property :exec_start_post, String
 property :exec_stop, String
 property :exec_reload, String
 property :runtime_directory, String
 property :runtime_directory_mode, Integer

+property :runtime_max_sec, 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,


@@ -48,64 +58,100 @@ 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 :no_new_privileges, [TrueClass, FalseClass]
+property :read_write_paths, [String, Array]
+property :read_only_paths, [String, Array]
+property :inaccessible_paths, [String, Array]
+property :restrict_address_families, [String, Array]
+property :no_new_privileges, [true, false]
+property :tasks_max, Integer

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

+property :nice, Integer
+property :io_scheduling_class, [Integer, String]
+property :io_scheduling_priority, Integer
+property :kill_mode, String,
+         :is => %w[control-group process mixed none]

 
 action :create do
   service_variables = new_resource.to_hash
 
 
 action :create do
   service_variables = new_resource.to_hash
 

-  if environment_file.is_a?(Hash)
+  unless new_resource.dropin
+    service_variables[:type] ||= "simple"
+  end
+
+  if new_resource.environment_file.is_a?(Hash)

     template "/etc/default/#{new_resource.service}" do
       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
     template "/etc/default/#{new_resource.service}" do
       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"

-      mode 0o640
-      variables :environment => environment_file
+      mode "640"
+      variables :environment => new_resource.environment_file

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

-  template "/etc/systemd/system/#{new_resource.service}.service" do
+  if new_resource.dropin
+    directory dropin_directory do
+      owner "root"
+      group "root"
+      mode "755"
+    end
+  end
+
+  template config_name do

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

-    mode 0o644
+    mode "644"

     variables service_variables
     variables service_variables

+    notifies :run, "execute[systemctl-reload]"

   end
 
   end
 

-  execute "systemctl-reload-#{new_resource.service}.service" do
+  execute "systemctl-reload" 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/#{new_resource.service}.service]"

   end
 end
 
 action :delete do
   file "/etc/default/#{new_resource.service}" do
     action :delete
   end
 end
 
 action :delete do
   file "/etc/default/#{new_resource.service}" do
     action :delete

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

   end
 
   end
 

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

     action :delete
     action :delete

+    notifies :run, "execute[systemctl-reload]"

   end
 
   end
 

-  execute "systemctl-reload-#{new_resource.service}.service" do
+  execute "systemctl-reload" 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/#{new_resource.service}.service]"
+  end
+end
+
+action_class do
+  def dropin_directory
+    "/etc/systemd/system/#{new_resource.service}.service.d"
+  end
+
+  def config_name
+    if new_resource.dropin
+      "#{dropin_directory}/#{new_resource.dropin}.conf"
+    else
+      "/etc/systemd/system/#{new_resource.service}.service"
+    end

   end
 end
   end
 end