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

[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..197d8bddf80dd6972be5d9eb550f69f6d6d8ff79 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,9 +63,15 @@ 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 -%>

+<% if @umask -%>
+UMask=<%= @umask %>
+<% end -%>

 <% if @exec_start_pre -%>
 <% if @dropin -%>
 ExecStartPre=
 <% if @exec_start_pre -%>
 <% if @dropin -%>
 ExecStartPre=


@@ -85,7 +100,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 -%>


@@ -93,14 +118,41 @@ ExecReload=
 <% end -%>
 ExecReload=<%= @exec_reload %>
 <% end -%>
 <% end -%>
 ExecReload=<%= @exec_reload %>
 <% end -%>

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

 <% if @runtime_directory -%>
 RuntimeDirectory=<%= @runtime_directory %>
 <% end -%>
 <% if @runtime_directory_mode -%>
 RuntimeDirectoryMode=<%= sprintf("0%o", @runtime_directory_mode) %>
 <% end -%>
 <% if @runtime_directory -%>
 RuntimeDirectory=<%= @runtime_directory %>
 <% end -%>
 <% if @runtime_directory_mode -%>
 RuntimeDirectoryMode=<%= sprintf("0%o", @runtime_directory_mode) %>
 <% end -%>

-<% if @runtime_max_sec -%>
-RuntimeMaxSec=<%= @runtime_max_sec %>
+<% if @runtime_directory_preserve -%>
+RuntimeDirectoryPreserve=<%= @runtime_directory_preserve %>
+<% end -%>
+<% if @state_directory -%>
+StateDirectory=<%= @state_directory %>
+<% end -%>
+<% if @state_directory_mode -%>
+StateDirectoryMode=<%= sprintf("0%o", @state_directory_mode) %>
+<% end -%>
+<% if @cache_directory -%>
+CacheDirectory=<%= @cache_directory %>
+<% end -%>
+<% if @cache_directory_mode -%>
+CacheDirectoryMode=<%= sprintf("0%o", @cache_directory_mode) %>
+<% end -%>
+<% if @logs_directory -%>
+LogsDirectory=<%= @logs_directory %>
+<% end -%>
+<% if @logs_directory_mode -%>
+LogsDirectoryMode=<%= sprintf("0%o", @logs_directory_mode) %>
+<% end -%>
+<% if @configuration_directory -%>
+ConfigurationDirectory=<%= @configuration_directory %>
+<% end -%>
+<% if @configuration_directory_mode -%>
+ConfigurationDirectoryMode=<%= sprintf("0%o", @configuration_directory_mode) %>

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


@@ -111,18 +163,27 @@ 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 -%>
 ProcSubset=<%= @proc_subset %>
 <% end -%>

+<% if @bind_paths -%>
+BindPaths=<%= Array(@bind_paths).sort.uniq.join(" ") %>
+<% end -%>
+<% if @bind_read_only_paths -%>
+BindReadOnlyPaths=<%= Array(@bind_read_only_paths).sort.uniq.join(" ") %>
+<% end -%>

 <% if @no_new_privileges -%>
 NoNewPrivileges=<%= @no_new_privileges %>
 <% end -%>
 <% if @capability_bounding_set -%>
 CapabilityBoundingSet=<%= Array(@capability_bounding_set).sort.uniq.join(" ") %>
 <% end -%>
 <% if @no_new_privileges -%>
 NoNewPrivileges=<%= @no_new_privileges %>
 <% end -%>
 <% if @capability_bounding_set -%>
 CapabilityBoundingSet=<%= Array(@capability_bounding_set).sort.uniq.join(" ") %>
 <% end -%>

+<% if @ambient_capabilities -%>
+AmbientCapabilities=<%= Array(@ambient_capabilities).sort.uniq.join(" ") %>
+<% end -%>

 <% if @protect_system -%>
 ProtectSystem=<%= @protect_system %>
 <% end -%>
 <% if @protect_system -%>
 ProtectSystem=<%= @protect_system %>
 <% end -%>


@@ -147,7 +208,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 -%>


@@ -207,6 +268,9 @@ SuccessExitStatus=<%= Array(@success_exit_status).join(" ") %>
 <% if @restart -%>
 Restart=<%= @restart %>
 <% end -%>
 <% if @restart -%>
 Restart=<%= @restart %>
 <% end -%>

+<% if @restart_sec -%>
+RestartSec=<%= @restart_sec %>
+<% end -%>

 <% if @timeout_start_sec -%>
 TimeoutStartSec=<%= @timeout_start_sec %>
 <% end -%>
 <% if @timeout_start_sec -%>
 TimeoutStartSec=<%= @timeout_start_sec %>
 <% end -%>