systemd: add requires and array support for exec_stop

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 1194d4fd6435f1e183cb51274c368dc3fc26ca10..9a2c69fa870be28bfc4ca8d00decce71cb479202 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -29,6 +29,7 @@ property :condition_path_exists_glob, [String, Array]
 property :after, [String, Array]
 property :conflicts, [String, Array]
 property :wants, [String, Array]
 property :after, [String, Array]
 property :conflicts, [String, Array]
 property :wants, [String, Array]

+property :requires, [String, Array]

 property :joins_namespace_of, [String, Array]
 property :type, String, :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer
 property :joins_namespace_of, [String, Array]
 property :type, String, :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer


@@ -46,7 +47,7 @@ property :working_directory, String
 property :exec_start_pre, [String, Array]
 property :exec_start, [String, Array]
 property :exec_start_post, [String, Array]
 property :exec_start_pre, [String, Array]
 property :exec_start, [String, Array]
 property :exec_start_post, [String, Array]

-property :exec_stop, String
+property :exec_stop, [String, Array]

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

diff --git a/cookbooks/systemd/templates/default/service.erb b/cookbooks/systemd/templates/default/service.erb
index 858dbb3278fe9a2dc7384d540d3dc37c1ef69139..0685a70cae8c4bfc53ea723f09d0be9a0efb38ba 100644 (file)
--- a/cookbooks/systemd/templates/default/service.erb
+++ b/cookbooks/systemd/templates/default/service.erb
@@ -19,6 +19,9 @@ Conflicts=<%= Array(@conflicts).join(" ") %>
 <% if @wants -%>
 Wants=<%= Array(@wants).join(" ") %>
 <% end -%>
 <% if @wants -%>
 Wants=<%= Array(@wants).join(" ") %>
 <% end -%>

+<% if @requires -%>
+Requires=<%= Array(@requires).join(" ") %>
+<% end -%>

 <% if @joins_namespace_of -%>
 JoinsNamespaceOf=<%= Array(@joins_namespace_of).join(" ") %>
 <% end -%>
 <% if @joins_namespace_of -%>
 JoinsNamespaceOf=<%= Array(@joins_namespace_of).join(" ") %>
 <% end -%>


@@ -91,8 +94,10 @@ ExecStartPost=<%= exec_start_post %>
 <% if @dropin -%>
 ExecStop=
 <% end -%>
 <% if @dropin -%>
 ExecStop=
 <% end -%>

+<% Array(@exec_stop).each do |exec_stop| -%>

 ExecStop=<%= @exec_stop %>
 <% end -%>
 ExecStop=<%= @exec_stop %>
 <% end -%>

+<% end -%>

 <% if @exec_reload -%>
 <% if @dropin -%>
 ExecReload=
 <% if @exec_reload -%>
 <% if @dropin -%>
 ExecReload=