Increase nginx keepalive settings.

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index c31b6d0bc782695bcad2e3089bb12db45f6ab298..3132c63cdcba5829061cb3aef35c10fd986797e1 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -1,8 +1,8 @@
 #
-# 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.
@@ -20,13 +20,14 @@
 default_action :create
 
 property :service, String, :name_property => true
-property :description, String, :required => 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 :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]
@@ -36,7 +37,7 @@ 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
@@ -56,6 +57,7 @@ property :private_devices, [TrueClass, FalseClass]
 property :private_network, [TrueClass, FalseClass]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
+property :restrict_address_families, [String, Array]
 property :no_new_privileges, [TrueClass, FalseClass]
 property :timeout_sec, Integer
 property :pid_file, String
@@ -63,6 +65,10 @@ property :pid_file, String
 action :create do
   service_variables = new_resource.to_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"
@@ -76,39 +82,61 @@ action :create do
     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 0o755
+    end
+  end
+
+  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-#{new_resource.service}.service" do
+  execute "systemctl-reload" do
     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
-    only_if { environment_file.is_a?(Hash) }
+    only_if { new_resource.environment_file.is_a?(Hash) }
   end
 
-  file "/etc/systemd/system/#{new_resource.service}.service" do
+  file config_name do
     action :delete
+    notifies :run, "execute[systemctl-reload]"
   end
 
-  execute "systemctl-reload-#{new_resource.service}.service" do
+  execute "systemctl-reload" do
     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