X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dadcad86e0cf7122fe094992455e26443023dac9..883c754c10bcc8b94844658c61512dfbb8a2e8a3:/cookbooks/systemd/resources/service.rb

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index df62481a5..3132c63cd 100644
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: systemd
+# Cookbook:: systemd
 # 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
 #
-# 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,
@@ -19,90 +19,124 @@
 
 default_action :create
 
-property :name, String
-property :description, String, :required => true
+property :service, String, :name_property => true
+property :dropin, String
+property :description, String
 property :after, [String, Array]
 property :wants, [String, Array]
-property :type, String,
-         :default => "simple",
-         :is => %w(simple forking oneshot dbus notify idle)
-property :limit_nofile, Fixnum
+property :type, String, :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_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, Fixnum
+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,
-         :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,
-         :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,
-         :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 :timeout_sec, Fixnum
+property :restrict_address_families, [String, Array]
+property :no_new_privileges, [TrueClass, FalseClass]
+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
+  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"
       mode 0o640
-      variables :environment => environment_file
+      variables :environment => new_resource.environment_file
     end
 
-    service_variables[:environment_file] = "/etc/default/#{name}"
+    service_variables[:environment_file] = "/etc/default/#{new_resource.service}"
+  end
+
+  if new_resource.dropin
+    directory dropin_directory do
+      owner "root"
+      group "root"
+      mode 0o755
+    end
   end
 
-  template "/etc/systemd/system/#{name}.service" do
+  template config_name do
     cookbook "systemd"
     source "service.erb"
     owner "root"
     group "root"
     mode 0o644
     variables service_variables
+    notifies :run, "execute[systemctl-reload]"
   end
 
-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "template[/etc/systemd/system/#{name}.service]"
   end
 end
 
 action :delete do
-  file "/etc/default/#{name}" 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
 
-  file "/etc/systemd/system/#{name}.service" do
+  file config_name do
     action :delete
+    notifies :run, "execute[systemctl-reload]"
   end
 
-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "file[/etc/systemd/system/#{name}.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