Merge remote-tracking branch 'github/pull/459'

[chef.git] / cookbooks / systemd / templates / default / service.erb

diff --git a/cookbooks/systemd/templates/default/service.erb b/cookbooks/systemd/templates/default/service.erb
index ed117c24e51932c849cce0ed0c0ea42792c4798c..7786ab6090e0a93102c4c1867e3a66a55df8e41b 100644 (file)
--- a/cookbooks/systemd/templates/default/service.erb
+++ b/cookbooks/systemd/templates/default/service.erb
@@ -4,9 +4,18 @@
 <% if @description -%>
 Description=<%= @description %>
 <% end -%>
 <% if @description -%>
 Description=<%= @description %>
 <% end -%>

+<% if @condition_path_exists -%>
+ConditionPathExists=<%= Array(@condition_path_exists).join(" ") %>
+<% end -%>
+<% if @condition_path_exists_glob -%>
+ConditionPathExistsGlob=<%= Array(@condition_path_exists_glob).join(" ") %>
+<% end -%>

 <% if @after -%>
 After=<%= Array(@after).join(" ") %>
 <% end -%>
 <% if @after -%>
 After=<%= Array(@after).join(" ") %>
 <% end -%>

+<% if @conflicts -%>
+Conflicts=<%= Array(@conflicts).join(" ") %>
+<% end -%>

 <% if @wants -%>
 Wants=<%= Array(@wants).join(" ") %>
 <% end -%>
 <% if @wants -%>
 Wants=<%= Array(@wants).join(" ") %>
 <% end -%>


@@ -49,18 +58,33 @@ Group=<%= @group %>
 WorkingDirectory=<%= @working_directory %>
 <% end -%>
 <% if @exec_start_pre -%>
 WorkingDirectory=<%= @working_directory %>
 <% end -%>
 <% if @exec_start_pre -%>

+<% if @dropin -%>
+ExecStartPre=
+<% end -%>

 ExecStartPre=<%= @exec_start_pre %>
 <% end -%>
 <% if @exec_start -%>
 ExecStartPre=<%= @exec_start_pre %>
 <% end -%>
 <% if @exec_start -%>

+<% if @dropin -%>
+ExecStart=
+<% end -%>

 ExecStart=<%= @exec_start %>
 <% end -%>
 <% if @exec_start_post -%>
 ExecStart=<%= @exec_start %>
 <% end -%>
 <% if @exec_start_post -%>

+<% if @dropin -%>
+ExecStartPost=
+<% end -%>

 ExecStartPost=<%= @exec_start_post %>
 <% end -%>
 <% if @exec_stop -%>
 ExecStartPost=<%= @exec_start_post %>
 <% end -%>
 <% if @exec_stop -%>

+<% if @dropin -%>
+ExecStop=
+<% end -%>

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

+<% if @dropin -%>
+ExecReload=
+<% end -%>

 ExecReload=<%= @exec_reload %>
 <% end -%>
 <% if @runtime_directory -%>
 ExecReload=<%= @exec_reload %>
 <% end -%>
 <% if @runtime_directory -%>


@@ -69,6 +93,9 @@ RuntimeDirectory=<%= @runtime_directory %>
 <% if @runtime_directory_mode -%>
 RuntimeDirectoryMode=<%= sprintf("0%o", @runtime_directory_mode) %>
 <% end -%>
 <% if @runtime_directory_mode -%>
 RuntimeDirectoryMode=<%= sprintf("0%o", @runtime_directory_mode) %>
 <% end -%>

+<% if @runtime_max_sec -%>
+RuntimeMaxSec=<%= @runtime_max_sec %>
+<% end -%>

 <% if @standard_input -%>
 StandardInput=<%= @standard_input %>
 <% end -%>
 <% if @standard_input -%>
 StandardInput=<%= @standard_input %>
 <% end -%>


@@ -93,12 +120,24 @@ ProtectSystem=<%= @protect_system %>
 <% if @protect_home -%>
 ProtectHome=<%= @protect_home %>
 <% end -%>
 <% if @protect_home -%>
 ProtectHome=<%= @protect_home %>
 <% end -%>

+<% if @read_write_paths -%>
+ReadWritePaths=<%= Array(@read_write_paths).join(" ") %>
+<% end -%>
+<% if @read_only_paths -%>
+ReadOnlyPaths=<%= Array(@read_only_paths).join(" ") %>
+<% end -%>
+<% if @inaccessible_paths -%>
+InaccessiblePaths=<%= Array(@inaccessible_paths).join(" ") %>
+<% end -%>

 <% if @restrict_address_families -%>
 RestrictAddressFamilies=<%= Array(@restrict_address_families).join(" ") %>
 <% end -%>
 <% if @no_new_privileges -%>
 NoNewPrivileges=<%= @no_new_privileges %>
 <% end -%>
 <% if @restrict_address_families -%>
 RestrictAddressFamilies=<%= Array(@restrict_address_families).join(" ") %>
 <% end -%>
 <% if @no_new_privileges -%>
 NoNewPrivileges=<%= @no_new_privileges %>
 <% end -%>

+<% if @tasks_max -%>
+TasksMax=<%= @tasks_max %>
+<% end -%>

 <% if @success_exit_status -%>
 SuccessExitStatus=<%= Array(@success_exit_status).join(" ") %>
 <% end -%>
 <% if @success_exit_status -%>
 SuccessExitStatus=<%= Array(@success_exit_status).join(" ") %>
 <% end -%>


@@ -111,6 +150,18 @@ TimeoutSec=<%= @timeout_sec %>
 <% if @pid_file -%>
 PIDFile=<%= @pid_file %>
 <% end -%>
 <% if @pid_file -%>
 PIDFile=<%= @pid_file %>
 <% end -%>

+<% if @nice -%>
+Nice=<%= @nice %>
+<% end -%>
+<% if @io_scheduling_class -%>
+IOSchedulingClass=<%= @io_scheduling_class %>
+<% end -%>
+<% if @io_scheduling_priority -%>
+IOSchedulingPriority=<%= @io_scheduling_priority %>
+<% end -%>
+<% if @kill_mode -%>
+KillMode=<%= @kill_mode %>
+<% end -%>

 <% unless @dropin -%>
 
 [Install]
 <% unless @dropin -%>
 
 [Install]