Merge pull request #53 from davidnewhall/master

Add syslog facility, memlock and core limits to service template.
NTTCom-MS · Jan 22, 2018 · 0ac17d0 · 0ac17d0
2 parents 73811dc + e5a5aa8
commit 0ac17d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -30,9 +30,11 @@
                           $timeoutstopsec              = undef,
                           $timeoutsec                  = undef,
                           $restart_prevent_exit_status = undef,
+                          $limit_memlock               = undef,
                           $limit_nofile                = undef,
                           $limit_nproc                 = undef,
                           $limit_nice                  = undef,
+                          $limit_core                  = undef,
                           $runtime_directory           = undef,
                           $runtime_directory_mode      = undef,
                           $restart_sec                 = undef,
@@ -46,6 +48,7 @@
                           $startlimitburst             = undef,
                           $standard_output             = 'syslog',
                           $standard_error              = 'syslog',
+                          $syslog_facility             = undef,
                           $killmode                    = undef,
                           $successexitstatus           = [],
                           $killsignal                  = undef,

diff --git a/templates/service.erb b/templates/service.erb
@@ -76,6 +76,9 @@ StandardError=<%= @standard_error %>
 <% if defined?(@syslogidentifier) -%>
 SyslogIdentifier=<%= @syslogidentifier %>
 <% end -%>
+<% if defined?(@syslog_facility) -%>
+SyslogFacility=<%= @syslog_facility %>
+<% end -%>
 <% if defined?(@user) -%>
 User=<%= @user %>
 <% end -%>
@@ -123,6 +126,9 @@ RestartPreventExitStatus=<%= @restart_prevent_exit_status.join(' ') %>
 RestartPreventExitStatus=<%= @restart_prevent_exit_status %>
   <%- end -%>
 <% end -%>
+<% if defined?(@limit_memlock) -%>
+LimitMEMLOCK = <%= @limit_memlock %>
+<% end -%>
 <% if defined?(@limit_nofile) -%>
 LimitNOFILE = <%= @limit_nofile %>
 <% end -%>
@@ -132,6 +138,9 @@ LimitNPROC = <%= @limit_nproc %>
 <% if defined?(@limit_nice) -%>
 LimitNICE = <%= @limit_nice %>
 <% end -%>
+<% if defined?(@limit_core) -%>
+LimitCORE = <%= @limit_core %>
+<% end -%>
 <% if defined?(@runtime_directory) -%>
   <%- if @runtime_directory.kind_of?(Array) -%>
 RuntimeDirectory=<%= @runtime_directory.join(' ') %>