Merge pull request #3 from racciari/master

Fix default limits
open-io · Apr 4, 2016 · 0d6d96a · 0d6d96a
2 parents 46f6778 + 08af31a
commit 0d6d96a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -59,9 +59,9 @@
   $directory_mode           = '0755'
   $directory_ensure         = 'directory'
   # Global parameters
-  $limit_core_size          = '-1'
-  $limit_max_files          = '8192'
-  $limit_stack_size         = '256'
+  $limit_core_size          = '0'
+  $limit_max_files          = '65536'
+  $limit_stack_size         = '8192'
   # Others
   $no_exec                  = false
 }
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "openio-gridinit",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "author": "Romain Acciari",
   "summary": "Puppet module for gridinit from OpenIO",
   "license": "Apache-2.0",

diff --git a/templates/gridinit.conf.erb b/templates/gridinit.conf.erb
@@ -5,8 +5,14 @@ uid=<%= scope['gridinit::user'] %>
 gid=<%= scope['gridinit::group'] %>
 working_dir=<%= @runstatedir %>
 
+<% if @limit_core_size -%>
 limit.core_size=<%= @limit_core_size %>
+<% end -%>
+<% if @limit_max_files -%>
 limit.max_files=<%= @limit_max_files %>
+<% end -%>
+<% if @limit_stack_size -%>
 limit.stack_size=<%= @limit_stack_size %>
+<% end -%>
 
 include=<%= @sysconfdird %>/*