foundation: use noreply wiki sender

[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 c53439a2b292003868c090dce6e8c8378422d815..a4ff29fa96988f92a167a8a6af9b787bafc5fde9 100644 (file)
--- a/cookbooks/systemd/templates/default/service.erb
+++ b/cookbooks/systemd/templates/default/service.erb
@@ -19,11 +19,20 @@ 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 -%>

 
 [Service]
 <% if @type -%>
 Type=<%= @type %>
 <% end -%>
 
 [Service]
 <% if @type -%>
 Type=<%= @type %>
 <% end -%>

+<% if @notify_access -%>
+NotifyAccess=<%= @notify_access %>
+<% end -%>

 <% if @limit_nofile -%>
 LimitNOFILE=<%= @limit_nofile %>
 <% end -%>
 <% if @limit_nofile -%>
 LimitNOFILE=<%= @limit_nofile %>
 <% end -%>


@@ -54,6 +63,9 @@ User=<%= @user %>
 <% if @group -%>
 Group=<%= @group %>
 <% end -%>
 <% if @group -%>
 Group=<%= @group %>
 <% end -%>

+<% if @dynamic_user -%>
+DynamicUser=<%= @dynamic_user %>
+<% end -%>

 <% if @working_directory -%>
 WorkingDirectory=<%= @working_directory %>
 <% end -%>
 <% if @working_directory -%>
 WorkingDirectory=<%= @working_directory %>
 <% end -%>


@@ -85,7 +97,17 @@ ExecStartPost=<%= exec_start_post %>
 <% if @dropin -%>
 ExecStop=
 <% end -%>
 <% if @dropin -%>
 ExecStop=
 <% end -%>

-ExecStop=<%= @exec_stop %>
+<% Array(@exec_stop).each do |exec_stop| -%>
+ExecStop=<%= exec_stop %>
+<% end -%>
+<% end -%>
+<% if @exec_stop_post -%>
+<% if @dropin -%>
+ExecStopPost=
+<% end -%>
+<% Array(@exec_stop_post).each do |exec_stop_post| -%>
+ExecStopPost=<%= exec_stop_post %>
+<% end -%>

 <% end -%>
 <% if @exec_reload -%>
 <% if @dropin -%>
 <% end -%>
 <% if @exec_reload -%>
 <% if @dropin -%>


@@ -111,10 +133,10 @@ StandardOutput=<%= @standard_output %>
 <% if @standard_error -%>
 StandardError=<%= @standard_error %>
 <% end -%>
 <% if @standard_error -%>
 StandardError=<%= @standard_error %>
 <% end -%>

-<% if @protect_proc -%>
+<% if @protect_proc && node[:lsb][:release].to_f >= 22.04  -%>

 ProtectProc=<%= @protect_proc %>
 <% end -%>
 ProtectProc=<%= @protect_proc %>
 <% end -%>

-<% if @proc_subset -%>
+<% if @proc_subset && node[:lsb][:release].to_f >= 22.04 -%>

 ProcSubset=<%= @proc_subset %>
 <% end -%>
 <% if @no_new_privileges -%>
 ProcSubset=<%= @proc_subset %>
 <% end -%>
 <% if @no_new_privileges -%>


@@ -147,7 +169,7 @@ PrivateDevices=<%= @private_devices %>
 <% if @private_network -%>
 PrivateNetwork=<%= @private_network %>
 <% end -%>
 <% if @private_network -%>
 PrivateNetwork=<%= @private_network %>
 <% end -%>

-<% if @private_ipc -%>
+<% if @private_ipc && node[:lsb][:release].to_f >= 22.04 -%>

 PrivateIPC=<%= @private_ipc %>
 <% end -%>
 <% if @private_users -%>
 PrivateIPC=<%= @private_ipc %>
 <% end -%>
 <% if @private_users -%>