From 14347a1fd9caea0f5738f082fadfd88a25011e50 Mon Sep 17 00:00:00 2001
From: Jake Humphries <jake.humphries@lifecycle-software.com>
Date: Wed, 20 Jan 2016 16:52:26 +0000
Subject: [PATCH 01/32] Updates to allow for arrays to be used in defined
 type's parameters.

---
 README.md               | 18 ++++++++++++------
 manifests/params.pp     | 26 +++++++++++++-------------
 manifests/rule.pp       | 10 +++++++---
 templates/rule.conf.erb |  8 ++++++--
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index ff497f5..f1390c2 100644
--- a/README.md
+++ b/README.md
@@ -18,16 +18,22 @@
       ulimit::rule {
         'example1':
           ulimit_domain => '*',
-          ulimit_type   => 'soft',
-          ulimit_item   => 'nofile',
-          ulimit_value  => '1024';
+          ulimit_type   => ['soft'],
+          ulimit_item   => ['nofile'],
+          ulimit_value  => ['1024'];
 
         'example2':
           ensure        => absent,
           ulimit_domain => '*',
-          ulimit_type   => 'hard',
-          ulimit_item   => 'nofile',
-          ulimit_value  => '50000';
+          ulimit_type   => ['hard'],
+          ulimit_item   => ['nofile'],
+          ulimit_value  => ['50000'];
+
+        'example3':
+          ulimit_domain => '*',
+          ulimit_type   => ['soft', 'soft'],
+          ulimit_item   => ['nofile', 'nproc''],
+          ulimit_value  => ['1024', 'unlimited'];
       }
     }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index c7a96bf..dab4551 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -22,16 +22,16 @@
           'nproc_user_defaults' => {
             'priority'          => '90',
             'ulimit_domain'     => '*',
-            'ulimit_item'       => 'nproc',
-            'ulimit_type'       => 'soft',
-            'ulimit_value'      => '1024',
+            'ulimit_item'       => ['nproc'],
+            'ulimit_type'       => ['soft'],
+            'ulimit_value'      => ['1024'],
           },
           'nproc_root_defaults' => {
             'priority'          => '90',
             'ulimit_domain'     => 'root',
-            'ulimit_item'       => 'nproc',
-            'ulimit_type'       => 'soft',
-            'ulimit_value'      => 'unlimited',
+            'ulimit_item'       => ['nproc'],
+            'ulimit_type'       => ['soft'],
+            'ulimit_value'      => ['unlimited'],
           },
         }
       } elsif $::operatingsystemmajrelease == '7' {
@@ -40,16 +40,16 @@
           'nproc_user_defaults' => {
             'priority'          => '20',
             'ulimit_domain'     => '*',
-            'ulimit_item'       => 'nproc',
-            'ulimit_type'       => 'soft',
-            'ulimit_value'      => '4096',
+            'ulimit_item'       => ['nproc'],
+            'ulimit_type'       => ['soft'],
+            'ulimit_value'      => ['4096'],
           },
           'nproc_root_defaults' => {
             'priority'          => '20',
-            'ulimit_domain'     => 'root',
-            'ulimit_item'       => 'nproc',
-            'ulimit_type'       => 'soft',
-            'ulimit_value'      => 'unlimited',
+            'ulimit_domain'     => ['root'],
+            'ulimit_item'       => ['nproc'],
+            'ulimit_type'       => ['soft'],
+            'ulimit_value'      => ['unlimited'],
           },
         }
       } else {
diff --git a/manifests/rule.pp b/manifests/rule.pp
index 9ea77ab..980be5a 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -49,13 +49,17 @@
 #
 define ulimit::rule (
   $ulimit_domain,
-  $ulimit_type,
-  $ulimit_item,
-  $ulimit_value,
+  $ulimit_type = [],
+  $ulimit_item = [],
+  $ulimit_value = [],
   $priority = 80,
   $ensure = present,
 ) {
   require ::ulimit
+  
+  if (size($ulimit_type) != size($ulimit_item)) or (size($ulimit_item) != size($ulimit_value)) { 
+    fail("Array's are not the same size")
+  }
 
   File {
     group => $::ulimit::config_group,
diff --git a/templates/rule.conf.erb b/templates/rule.conf.erb
index 3351770..0b23360 100644
--- a/templates/rule.conf.erb
+++ b/templates/rule.conf.erb
@@ -1,4 +1,8 @@
+# File controlled by Puppet
+# DO NOT EDIT LOCALLY
+#
 # <domain> <type> <item> <value>
 #
-
-<%= @ulimit_domain %>		<%= @ulimit_type %>		<%= @ulimit_item %>		<%= @ulimit_value %>
+<% (0..@ulimit_type.length-1).each do |i| %>
+<%= @ulimit_domain %>		<%= @ulimit_type[i] %>		<%= @ulimit_item[i] %>		<%= @ulimit_value[i] %>
+<% end %>

From d3fa2d50961c64d3524e2d2df93e867b5237ed22 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Wed, 4 Oct 2017 21:09:37 +0200
Subject: [PATCH 02/32] update content of 'Rakefile'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 Rakefile | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Rakefile

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..b4597de
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,31 @@
+##############################################################################
+# Rakefile - Configuration file for rake (http://rake.rubyforge.org/)
+# Time-stamp: <Lun 2015-03-09 16:53 svarrette>
+#
+# Copyright (c) 2017  <>
+#                       ____       _         __ _ _
+#                      |  _ \ __ _| | _____ / _(_) | ___
+#                      | |_) / _` | |/ / _ \ |_| | |/ _ \
+#                      |  _ < (_| |   <  __/  _| | |  __/
+#                      |_| \_\__,_|_|\_\___|_| |_|_|\___|
+#
+# Use 'rake -T' to list the available actions
+#
+# Resources:
+# * http://www.stuartellis.eu/articles/rake/
+##############################################################################
+require 'falkorlib'
+
+## placeholder for custom configuration of FalkorLib.config.*
+## See https://github.com/Falkor/falkorlib
+
+
+# Git flow customization
+FalkorLib.config.gitflow do |c|
+    c[:branches] = {
+        :master  => 'production',
+        :develop => 'master'
+    }
+end
+
+require 'falkorlib/tasks/git'

From eaa3942b9f5d87e0dd1e4c8c925b9d797bb2e850 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Wed, 4 Oct 2017 21:09:42 +0200
Subject: [PATCH 03/32] add '.ruby-version'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 .ruby-version | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..8dbb0f2
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.1.10

From 5be37b54c1ce514bc7b052e4c90e896a49dc6dc3 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Wed, 4 Oct 2017 21:09:49 +0200
Subject: [PATCH 04/32] add '.ruby-gemset'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 .ruby-gemset | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .ruby-gemset

diff --git a/.ruby-gemset b/.ruby-gemset
new file mode 100644
index 0000000..17cb753
--- /dev/null
+++ b/.ruby-gemset
@@ -0,0 +1 @@
+puppet

From 3a467fa1ab3c2d6e2dfd56224d203381b0808b7c Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Wed, 4 Oct 2017 21:41:49 +0200
Subject: [PATCH 05/32] update layout for puppet module

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 .ruby-gemset |   2 +-
 Gemfile      |  32 +++++-----
 Gemfile.lock | 170 ++++++++++++++++++++++++++++++++++++++-------------
 Rakefile     |   4 ++
 4 files changed, 147 insertions(+), 61 deletions(-)

diff --git a/.ruby-gemset b/.ruby-gemset
index 17cb753..f5c9f65 100644
--- a/.ruby-gemset
+++ b/.ruby-gemset
@@ -1 +1 @@
-puppet
+puppet-ulimit
diff --git a/Gemfile b/Gemfile
index ddf6bff..f366309 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,21 +1,21 @@
 source 'https://rubygems.org'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : ['>= 3.8.1']
-gem 'puppet', puppetversion
+gem 'falkorlib' #, :path => '~/git/github.com/Falkor/falkorlib'
 
-if puppetversion =~ /^3/
-  ## rspec-hiera-puppet is puppet 3 only
-  gem 'rspec-hiera-puppet', '>=1.0.0'
+group :test do
+  gem "rake"
+  gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 4.10.0'
+  gem 'puppet-strings'
+  gem 'puppetlabs_spec_helper'
+  gem 'metadata-json-lint'
+  gem "puppet-lint-absolute_classname-check"
+  gem "puppet-lint-leading_zero-check"
+  gem "puppet-lint-trailing_comma-check"
+  gem "puppet-lint-version_comparison-check"
+  gem "puppet-lint-classes_and_types_beginning_with_digits-check"
+  gem "puppet-lint-unquoted_string-check"
+  gem 'puppet-lint-resource_reference_syntax'
+  gem 'puppet-syntax'
 end
 
-facterversion = ENV.key?('FACTER_VERSION') ? "~> #{ENV['FACTER_VERSION']}" : ['>= 2.4.4']
-
-gem 'facter', facterversion
-
-gem 'rake'
-gem 'rspec'
-gem 'puppet-lint', '>=1.1.0'
-gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
-gem 'puppetlabs_spec_helper', '>=0.10.3'
-gem 'puppet-syntax'
-
+require 'falkorlib/tasks/puppet'
diff --git a/Gemfile.lock b/Gemfile.lock
index b2aa50c..80387ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,60 +1,142 @@
-GIT
-  remote: https://github.com/rodjek/rspec-puppet.git
-  revision: ee85f33a47a671207f0c88713e1c82a55c096081
-  specs:
-    rspec-puppet (2.3.0)
-      rspec
-
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
-    diff-lcs (1.2.5)
-    facter (2.4.4)
-      CFPropertyList (~> 2.2.6)
-    hiera (2.0.0)
-      json_pure
-    json_pure (1.8.2)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    artii (2.1.2)
+    awesome_print (1.8.0)
+    configatron (3.2.0)
+    deep_merge (1.0.1)
+    diff-lcs (1.3)
+    diffy (3.2.0)
+    facter (2.4.6)
+    falkorlib (0.7.9)
+      activesupport (~> 4.0)
+      artii (>= 2.1)
+      awesome_print (~> 1.2)
+      configatron (~> 3.2)
+      deep_merge (~> 1.0.1)
+      diffy (>= 3.0)
+      facter (~> 2.4.1)
+      git_remote_branch (~> 0)
+      json (~> 1.8)
+      license-generator (~> 0)
+      logger (>= 1.2.8)
+      minigit (~> 0)
+      rake (~> 10.1, >= 10.1.0)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19)
+      thor-zsh_completion
+    fast_gettext (1.1.0)
+    gettext (3.2.4)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.28)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2)
+      locale
+    git_remote_branch (0.3.8)
+    hiera (3.4.2)
+    i18n (0.8.6)
+    json (1.8.6)
+    json-schema (2.8.0)
+      addressable (>= 2.4)
+    json_pure (1.8.6)
+    license-generator (0.4.1)
+      thor
+    locale (2.1.2)
+    logger (1.2.8)
     metaclass (0.0.4)
-    mocha (1.1.0)
+    metadata-json-lint (2.0.2)
+      json-schema (~> 2.8)
+      spdx-licenses (~> 1.0)
+    minigit (0.0.4)
+    minitest (5.10.3)
+    mocha (1.3.0)
       metaclass (~> 0.0.1)
-    puppet (4.1.0)
+    public_suffix (3.0.0)
+    puppet (4.10.8)
       facter (> 2.0, < 4)
-      hiera (>= 2.0, < 3)
-      json_pure
-    puppet-lint (1.1.0)
-    puppet-syntax (2.0.0)
+      gettext-setup (>= 0.10, < 1)
+      hiera (>= 2.0, < 4)
+      json_pure (~> 1.8)
+      locale (~> 2.1)
+    puppet-lint (2.3.3)
+    puppet-lint-absolute_classname-check (0.2.4)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-lint-classes_and_types_beginning_with_digits-check (0.1.2)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-lint-leading_zero-check (0.1.1)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-lint-resource_reference_syntax (1.0.10)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-lint-trailing_comma-check (0.3.2)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-lint-unquoted_string-check (0.3.0)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-lint-version_comparison-check (0.2.1)
+      puppet-lint (>= 1.0, < 3.0)
+    puppet-strings (1.1.0)
+      yard (~> 0.9.5)
+    puppet-syntax (2.4.1)
       rake
-    puppetlabs_spec_helper (0.10.3)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec-puppet
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    puppetlabs_spec_helper (2.3.2)
+      mocha (~> 1.0)
+      puppet-lint (~> 2.0)
+      puppet-syntax (~> 2.0)
+      rspec-puppet (~> 2.0)
+    rake (10.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.6.0)
+    rspec-puppet (2.6.9)
+      rspec
+    rspec-support (3.6.0)
+    spdx-licenses (1.1.0)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    text (1.3.1)
+    thor (0.20.0)
+    thor-zsh_completion (0.1.4)
+      thor (~> 0)
+    thread_safe (0.3.6)
+    tins (1.15.0)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  facter (>= 2.4.4)
-  puppet (>= 3.8.1)
-  puppet-lint (>= 1.1.0)
+  falkorlib
+  metadata-json-lint
+  puppet (~> 4.10.0)
+  puppet-lint-absolute_classname-check
+  puppet-lint-classes_and_types_beginning_with_digits-check
+  puppet-lint-leading_zero-check
+  puppet-lint-resource_reference_syntax
+  puppet-lint-trailing_comma-check
+  puppet-lint-unquoted_string-check
+  puppet-lint-version_comparison-check
+  puppet-strings
   puppet-syntax
-  puppetlabs_spec_helper (>= 0.10.3)
+  puppetlabs_spec_helper
   rake
-  rspec
-  rspec-puppet!
+
+BUNDLED WITH
+   1.15.4
diff --git a/Rakefile b/Rakefile
index b4597de..e889ccd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,10 +15,14 @@
 # * http://www.stuartellis.eu/articles/rake/
 ##############################################################################
 require 'falkorlib'
+require 'puppetlabs_spec_helper/rake_tasks'
 
 ## placeholder for custom configuration of FalkorLib.config.*
 ## See https://github.com/Falkor/falkorlib
 
+FalkorLib.config.versioning do |c|
+  c[:type] = 'puppet_module'
+end
 
 # Git flow customization
 FalkorLib.config.gitflow do |c|

From c4530353f06ed27af185caceb08fa46f637f2b2d Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 10:23:55 +0200
Subject: [PATCH 06/32] update metadata

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/metadata.json b/metadata.json
index 7cdcb10..2202d37 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,14 +1,14 @@
 {
-  "name": "arioch-ulimit",
+  "name": "falkor-ulimit",
   "version": "0.0.2",
-  "author": "Tom De Vylder",
-  "summary": "Ulimit module",
+  "author": "Tom De Vylder, Sebastien Varrette",
+  "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his slide",
   "license": "Apache License, Version 2.0",
-  "source": "https://github.com/arioch/puppet-ulimit",
+  "source": "https://github.com/Falkor/puppet-ulimit",
   "project_page": "http://arioch.github.io/puppet-ulimit/",
   "issues_url": "https://github.com/arioch/puppet-ulimit/issues",
   "dependencies": [
-  
+
   ],
   "description": "ulimit",
   "tags": [

From 9746c2094063c51f598fefe38813b6342dcfcf2c Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 10:25:35 +0200
Subject: [PATCH 07/32] lint

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 manifests/rule.pp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifests/rule.pp b/manifests/rule.pp
index 980be5a..3b45d80 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -56,8 +56,7 @@
   $ensure = present,
 ) {
   require ::ulimit
-  
-  if (size($ulimit_type) != size($ulimit_item)) or (size($ulimit_item) != size($ulimit_value)) { 
+  if (size($ulimit_type) != size($ulimit_item)) or (size($ulimit_item) != size($ulimit_value)) {
     fail("Array's are not the same size")
   }
 
@@ -87,4 +86,3 @@
     }
   }
 }
-

From 821ab1890b7d3ed1da6daf071792b6151cfe27eb Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 10:25:47 +0200
Subject: [PATCH 08/32] bump to version '0.1.0'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 2202d37..9eb6852 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "falkor-ulimit",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his slide",
   "license": "Apache License, Version 2.0",
@@ -59,4 +59,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file

From 0b125c119792842a009503fdc9bed5f69725d76d Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 11:13:50 +0200
Subject: [PATCH 09/32] correct module name

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 9eb6852..d68a3f9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,5 +1,5 @@
 {
-  "name": "falkor-ulimit",
+  "name": "svarrette-ulimit",
   "version": "0.1.0",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his slide",

From 4e2e22e44706139cac28f66065c0452ac4042e41 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 11:14:36 +0200
Subject: [PATCH 10/32] bump to version '0.1.1'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index d68a3f9..5a974f7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his slide",
   "license": "Apache License, Version 2.0",

From f79564b0fee28154c0bd043b14074ff2538f1d76 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 11:18:12 +0200
Subject: [PATCH 11/32] mispelling

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 5a974f7..8989123 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,7 +2,7 @@
   "name": "svarrette-ulimit",
   "version": "0.1.1",
   "author": "Tom De Vylder, Sebastien Varrette",
-  "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his slide",
+  "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his module",
   "license": "Apache License, Version 2.0",
   "source": "https://github.com/Falkor/puppet-ulimit",
   "project_page": "http://arioch.github.io/puppet-ulimit/",

From 055f130b0226b59bf2eccb0e62b0ed095028b342 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 12:43:08 +0200
Subject: [PATCH 12/32] dep on stdlib for empty() and is_a?()

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 8989123..ff875ff 100644
--- a/metadata.json
+++ b/metadata.json
@@ -8,7 +8,10 @@
   "project_page": "http://arioch.github.io/puppet-ulimit/",
   "issues_url": "https://github.com/arioch/puppet-ulimit/issues",
   "dependencies": [
-
+    {
+      "name": "puppetlabs-stdlib",
+      "version_requirement": ">=4.2.2 <5.0.0"
+    },
   ],
   "description": "ulimit",
   "tags": [
@@ -59,4 +62,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

From 25e7a1f862700ea5313320f7cdee57cbd4e8cc5b Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 12:44:11 +0200
Subject: [PATCH 13/32] puppet string docs

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 manifests/config.pp | 12 +++++++++++-
 manifests/init.pp   | 43 +++++++++++++++++++++++++++++++------------
 manifests/params.pp | 21 ++++++++++++++++++++-
 3 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index bd1db7c..c9f96f8 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,5 +1,16 @@
+################################################################################
+# Time-stamp: <Thu 2017-10-05 11:38 svarrette>
+#
+# File::      <tt>config.pp</tt>
+# Author::    Tom De Vylder, Sebastien Varrette
+# Copyright:: Copyright (c) 2015-2017 arioch,Falkor
+# License::   Apache-2.0
+#
+# ------------------------------------------------------------------------------
 # == Class: ulimit::config
 #
+# This PRIVATE class handles the configuration of ulimit
+#
 class ulimit::config {
   File {
     group => $::ulimit::config_group,
@@ -17,4 +28,3 @@
   }
 
 }
-
diff --git a/manifests/init.pp b/manifests/init.pp
index 7b3ae96..0985c8e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,20 +1,39 @@
+################################################################################
+# Time-stamp: <Thu 2017-10-05 11:41 svarrette>
+#
+# File::      <tt>init.pp</tt>
+# Author::    Tom De Vylder, Sebastien Varrette
+# Copyright:: Copyright (c) 2015-2017 arioch,Falkor
+# License::   Apache-2.0
+#
+# ------------------------------------------------------------------------------
 # == Class: ulimit
 #
-# === Parameters
+# ulimit provides control over the resources available to the shell and to
+# processes started by it, on systems that allow such control.
+# This class offers the ulimit::rule definition which permits to define soft
+# and/or hard limits over various domains.
+# - The soft limit is the value that the kernel enforces for the corresponding
+# resource.
+# - The hard limit acts as a ceiling for the soft limit.
 #
-# [*use_default_ulimits*]
-#   Boolean. If true, then default ulimit configuration for the OS/release is
-#   applied (if found)
-#   Default: true
+# @param config_dir          [String]  Default: '/etc/security/limits.d'
+# @param config_group        [String]  Default: 'root'
+# @param config_user         [String]  Default: 'root'
+# @param use_default_ulimits [String]  Default: true
+#         If true, then default ulimit configuration for the OS/release is
+#         applied (if found)
+# @param purge               [String]  Default: true
 #
 class ulimit (
-  $config_dir          = $ulimit::params::config_dir,
-  $config_group        = $ulimit::params::config_group,
-  $config_user         = $ulimit::params::config_user,
-  $use_default_ulimits = $ulimit::params::use_default_ulimits,
-  $purge               = $ulimit::params::purge,
-) inherits ::ulimit::params {
+  String  $config_dir          = $ulimit::params::config_dir,
+  String  $config_group        = $ulimit::params::config_group,
+  String  $config_user         = $ulimit::params::config_user,
+  Boolean $use_default_ulimits = $ulimit::params::use_default_ulimits,
+  Boolean $purge               = $ulimit::params::purge,
+)
+inherits ::ulimit::params
+{
   $default_ulimits = $ulimit::params::default_ulimits
   include ::ulimit::config
 }
-
diff --git a/manifests/params.pp b/manifests/params.pp
index dab4551..7d3d0dc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,6 +1,26 @@
+################################################################################
+# Time-stamp: <Thu 2017-10-05 11:37 svarrette>
+#
+# File::      <tt>params.pp</tt>
+# Author::    Tom De Vylder, Sebastien Varrette
+# Copyright:: Copyright (c) 2015-2017 arioch,Falkor
+# License::   Apache-2.0
+#
+# ------------------------------------------------------------------------------
 # == Class: ulimit::params
 #
+# In this class are defined as default variables values that are used in all
+# other ulimit classes and definitions.
+# This class should be included, where necessary, and eventually be enhanced
+# with support for more Operating Systems.
+#
+#
 class ulimit::params {
+
+  #### MODULE INTERNAL VARIABLES  #########
+  # (Modify to adapt to unsupported OSes)
+  #########################################
+
   $config_dir   = '/etc/security/limits.d'
   $config_group = 'root'
   $config_user  = 'root'
@@ -61,4 +81,3 @@
     }
   }
 }
-

From ba6d4a35ffeee2e511cb182d167b834d6411a2eb Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 12:44:22 +0200
Subject: [PATCH 14/32] support for string or array in ulimit::rule

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 manifests/rule.pp       | 95 ++++++++++++++++++++++++-----------------
 templates/rule.conf.erb | 19 ++++++---
 2 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/manifests/rule.pp b/manifests/rule.pp
index 3b45d80..ca8097d 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -1,9 +1,25 @@
+################################################################################
+# Time-stamp: <Thu 2017-10-05 12:08 svarrette>
+#
+# File::      <tt>rule.pp</tt>
+# Author::    Tom De Vylder, Sebastien Varrette
+# Copyright:: Copyright (c) 2015-2017 arioch,Falkor
+# License::   Apache-2.0
+#
+# ------------------------------------------------------------------------------
 # == Define: ulimit::rule
 #
+# Add a new ulimit rule within /etc/security/limits.d/
+#
 # === Parameters:
 #
-# $ulimit_domain::  Domain
-#                   <domain> can be:
+# @param ensure [String] Default: 'present'.
+#          Ensure the presence (or absence) of the ulimit rule
+# @param priority      [Integer] Default: 80
+#          Priority of the file, i.e. this rule will create the file
+#          '/etc/security/limits.d/<priority>_<label>'
+# @param ulimit_domain [String] Default: '*'
+#          ulimit Domain, which can be:
 #                     - an user name
 #                     - a group name, with @group syntax
 #                     - the wildcard *, for default entry
@@ -13,12 +29,12 @@
 #                       To apply a limit to the root user, <domain> must be
 #                       the literal username root.
 #
-# $ulimit_type::    Type
+# @param ulimit_type   [String or Array]
 #                   <type> can have the two values:
 #                     - "soft" for enforcing the soft limits
 #                     - "hard" for enforcing hard limits
 #
-# $ulimit_item::    Item
+# @param ulimit_item    [String or Array]
 #                   <item> can be one of the following:
 #                     - core - limits the core file size (KB)
 #                     - data - max data size (KB)
@@ -41,48 +57,47 @@
 #                     - rtprio - max realtime priority
 #                     - chroot - change root to directory (Debian-specific)
 #
-# $ulimit_value::   Numerical value
-#
-# $priority::       Default: 80
-#
-# $ensure::         Default: present
+# @param ulimit_value [String]
+#          Value to set for the domain / type
 #
 define ulimit::rule (
-  $ulimit_domain,
-  $ulimit_type = [],
-  $ulimit_item = [],
-  $ulimit_value = [],
-  $priority = 80,
-  $ensure = present,
-) {
+  Enum[
+    'present',
+    'absent'
+  ]       $ensure        = 'present',
+  Integer $priority      = 80,
+  String  $ulimit_domain = '*',
+  $ulimit_type           = undef,
+  $ulimit_item           = undef,
+  String $ulimit_value   = '',
+)
+{
   require ::ulimit
-  if (size($ulimit_type) != size($ulimit_item)) or (size($ulimit_item) != size($ulimit_value)) {
-    fail("Array's are not the same size")
-  }
+  include ::ulimit::config
 
-  File {
-    group => $::ulimit::config_group,
-    owner => $::ulimit::config_user,
+  if ($ulimit_type == undef or $ulimit_item == undef or empty($ulimit_value)) {
+    fail("${module_name} requires the definition of type, item and/or value")
+  }
+  if ! $ulimit_type.is_a?(String) and ! $ulimit_type.is_a?(Array) {
+    fail("Parameters ulimit_type is expected to be a string or an Array")
+  }
+  if ! $ulimit_item.is_a?(String) and ! $ulimit_item.is_a?(Array) {
+    fail("Parameters ulimit_item is expected to be a string or an Array")
   }
 
-  case $ensure {
-    'present': {
-      file {
-        "${::ulimit::config_dir}/${priority}_${name}.conf":
-          ensure  => $ensure,
-          content => template ('ulimit/rule.conf.erb');
-      }
-    }
-
-    'absent': {
-      file {
-        "${::ulimit::config_dir}/${priority}_${name}.conf":
-          ensure => $ensure;
-      }
-    }
+  $types = $ulimit_type.is_a?(String) {
+    true    => [ $ulimit_type ],
+    default => $ulimit_type,
+  }
+  $items = $ulimit_item.is_a?(String) {
+    true    => [ $ulimit_item ],
+    default => $ulimit_item,
+  }
 
-    default: {
-      fail 'No ensure value found for ulimit rule.'
-    }
+  file { "${::ulimit::config_dir}/${priority}_${name}.conf":
+    ensure  => $ensure,
+    content => template ('ulimit/rule.conf.erb'),
+    require => File[$::ulimit::config_dir],
   }
+
 }
diff --git a/templates/rule.conf.erb b/templates/rule.conf.erb
index 0b23360..1d67739 100644
--- a/templates/rule.conf.erb
+++ b/templates/rule.conf.erb
@@ -1,8 +1,17 @@
-# File controlled by Puppet
-# DO NOT EDIT LOCALLY
+# -*- mode: conf; -*-
+#####################################################################################
+# <%= scope['ulimit::config_dir'] %>/<%= @priority %>_<%= @name %>.conf
+#
+###################################################################################
+# /!\ DO NOT EDIT THIS FILE: It has been automatically generated by Puppet.
+#  In particular, any further changes will be overwritten at the next puppet
+#  invocation
+###################################################################################
 #
 # <domain> <type> <item> <value>
 #
-<% (0..@ulimit_type.length-1).each do |i| %>
-<%= @ulimit_domain %>		<%= @ulimit_type[i] %>		<%= @ulimit_item[i] %>		<%= @ulimit_value[i] %>
-<% end %>
+<% @types.each do |type| -%>
+<%    @items.each do |item| -%>
+<%= @ulimit_domain %>  <%= @type %> <%= @item %> <%= @ulimit_value %>
+<%    end -%>
+<% end -%>

From 4cf745950f85dfa44321469149e9242e8af70124 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 12:45:20 +0200
Subject: [PATCH 15/32] vagrant-based infra for tests

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 Vagrantfile                           | 140 ++++++++++++++++
 tests/vagrant/bootstrap.sh            | 229 ++++++++++++++++++++++++++
 tests/vagrant/config.yaml             |  51 ++++++
 tests/vagrant/puppet_modules_setup.rb |  74 +++++++++
 4 files changed, 494 insertions(+)
 create mode 100644 Vagrantfile
 create mode 100755 tests/vagrant/bootstrap.sh
 create mode 100644 tests/vagrant/config.yaml
 create mode 100755 tests/vagrant/puppet_modules_setup.rb

diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..29df3fe
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,140 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# Time-stamp: <Thu 2017-10-05 12:32 svarrette>
+###########################################################################################
+#              __     __                          _    __ _ _
+#              \ \   / /_ _  __ _ _ __ __ _ _ __ | |_ / _(_) | ___
+#               \ \ / / _` |/ _` | '__/ _` | '_ \| __| |_| | |/ _ \
+#                \ V / (_| | (_| | | | (_| | | | | |_|  _| | |  __/
+#                 \_/ \__,_|\__, |_|  \__,_|_| |_|\__|_| |_|_|\___|
+#                           |___/
+###########################################################################################
+require 'yaml'
+require 'ipaddr'
+require 'deep_merge'
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+TOP_SRCDIR = File.expand_path File.dirname(__FILE__)
+TOP_VAGRANT_TESTDIR  = File.join(TOP_SRCDIR, 'tests', 'vagrant')
+config_file   = File.join(TOP_VAGRANT_TESTDIR, 'config.yaml')
+
+###### Expected Vagrant plugins detection ######
+# For more information on the below plugins:
+# - https://github.com/oscar-stack/vagrant-hosts
+# - https://github.com/dotless-de/vagrant-vbguest
+# - https://github.com/emyl/vagrant-triggers
+# - https://github.com/fgrehm/vagrant-cachier
+# Terminal-table is a nice ruby gem for automatically print tables with nice layout
+###
+[ 'vagrant-hosts', 'vagrant-vbguest', 'vagrant-triggers', 'vagrant-cachier', 'terminal-table' ].each do |plugin|
+    abort "Install the  '#{plugin}' plugin with 'vagrant plugin install #{plugin}'" unless Vagrant.has_plugin?("#{plugin}")
+end
+require 'terminal-table'
+
+### Default settings ###
+DEFAULT_SETTINGS = {
+    :defaults => {
+        :os     => :centos7,
+        :ram    => 256,
+        :vcpus  => 1,
+        :vbguest_auto_update => true,
+    },
+    # Default domain settings
+    :network => {
+        :domain => 'vagrant.dev',
+        :range  => '10.10.1.0/24',
+        :ip_offset => 10,
+    },
+    # Default Boxes
+    :boxes => {
+        :centos7  => 'centos/7',
+        :debian8  => 'debian/contrib-jessie64',
+        :ubuntu14 => 'ubuntu/trusty64'
+    },
+    :vms => {
+        'default' => { }
+    },
+}
+
+# List of default provisioning scripts
+DEFAULT_PROVISIONING_SCRIPTS = [
+    "tests/vagrant/bootstrap.sh",
+    "tests/vagrant/puppet_modules_setup.rb"
+]
+
+# Load the settings (eventually overwritten using values from the yaml file 'config.yaml')
+settings = DEFAULT_SETTINGS.clone
+if File.exist?(config_file)
+    config = YAML::load_file config_file
+    settings.deep_merge!( config ) if config
+end
+abort "Undefined settings" if settings.nil?
+
+
+############################################################
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+    defaults = settings[:defaults]
+    network  = settings[:network]
+
+    ### Common configs shared by all VMs ###
+    # Cache plugin -- Supports local cache, so you don't wast bandwitdh
+    # vagrant plugin install vagrant-cachier   # see https://github.com/fgrehm/vagrant-cachier
+    config.cache.auto_detect = true if Vagrant.has_plugin?("vagrant-cachier")
+
+    # check if VirtualBox Guest Additions are up to date
+    if Vagrant.has_plugin?("vagrant-vbguest")
+        # set auto_update to false, if you do NOT want to check the correct
+        # additions version when booting these boxes
+        config.vbguest.auto_update = defaults[:vbguest_auto_update]
+    end
+
+    # Shell provisioner, to setup minimal conditions for Puppet provisioning
+    DEFAULT_PROVISIONING_SCRIPTS.each do |script|
+        config.vm.provision "shell", path: "#{script}", keep_color: true
+    end
+    config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+
+    # network settings
+    ipaddr   = IPAddr.new network[:range]
+    ip_range = ipaddr.to_range.to_a
+
+    # cosmetics for the post-up message
+    __table = {
+        :title    => "Puppet Testing infrastructure deployed on Vagrant",
+        :headings => [ 'Name', 'Hostname', 'OS', 'vCPU/RAM', 'Description', 'IP' ],
+        :rows => [],
+    }
+    #__________________________________
+    settings[:vms].each do |name, node|
+        boxname  = 'ulimit-' + defaults[:os].to_s.downcase.gsub(/([^\d]+)(\d+)/, '\\1-\\2')
+        name     = boxname if name == 'default'
+        hostname = node[:hostname] ? node[:hostname] : name
+        domain   = network[:domain]
+        fqdn     =    "#{hostname}.#{domain}"
+        os       =    node[:os]       ? node[:os].to_sym : defaults[:os].to_sym
+        ram      =    node[:ram]      ? node[:ram]       : defaults[:ram]
+        vcpus    =    node[:vcpus]    ? node[:vcpus]     : defaults[:vcpus]
+        desc     =    node[:desc]     ? node[:desc]      : 'n/a'
+
+        abort "Non-existing box OS '#{os}' for the VM '#{name}'" if  settings[:boxes][os.to_sym].nil?
+        abort "Empty IP address range" if ip_range.empty?
+        ip = ip_range[ network[:ip_offset].to_i ].to_s
+
+        config.vm.define "#{name}" do |c|
+            c.vm.box      = settings[:boxes][os.to_sym]
+            c.vm.hostname = "#{fqdn}"
+            c.vm.network :private_network, :ip => ip
+            c.vm.provision :hosts, :sync_hosts => true
+            c.vm.provider "virtualbox" do |v|
+                v.customize [ 'modifyvm', :id, '--name', hostname, '--memory', ram.to_s ]
+                v.customize [ 'modifyvm', :id, '--cpus', vcpus.to_s ] if vcpus.to_i > 1
+            end
+            __table[:rows] << [ name, fqdn, os.to_sym, "#{vcpus}/#{ram}", desc, ip]
+        end
+    end
+
+    config.trigger.after :up do
+        puts Terminal::Table.new __table
+    end
+end
diff --git a/tests/vagrant/bootstrap.sh b/tests/vagrant/bootstrap.sh
new file mode 100755
index 0000000..3e391b0
--- /dev/null
+++ b/tests/vagrant/bootstrap.sh
@@ -0,0 +1,229 @@
+#!/usr/bin/env bash
+# Time-stamp: <Sun 2017-08-20 19:08 svarrette>
+###########################################################################################
+# __     __                          _     ____              _       _
+# \ \   / /_ _  __ _ _ __ __ _ _ __ | |_  | __ )  ___   ___ | |_ ___| |_ _ __ __ _ _ __
+#  \ \ / / _` |/ _` | '__/ _` | '_ \| __| |  _ \ / _ \ / _ \| __/ __| __| '__/ _` | '_ \
+#   \ V / (_| | (_| | | | (_| | | | | |_  | |_) | (_) | (_) | |_\__ \ |_| | | (_| | |_) |
+#    \_/ \__,_|\__, |_|  \__,_|_| |_|\__| |____/ \___/ \___/ \__|___/\__|_|  \__,_| .__/
+#              |___/                                                              |_|
+#                  Copyright (c) 2017 UL HPC Team <hpc-sysadmins@uni.lu>
+###########################################################################################
+# ULHPC (prefered) way to see a Vagrant box configured.
+#
+
+SETCOLOR_NORMAL=$(tput sgr0)
+SETCOLOR_TITLE=$(tput setaf 6)
+SETCOLOR_SUBTITLE=$(tput setaf 14)
+SETCOLOR_RED=$(tput setaf 1)
+SETCOLOR_BOLD=$(tput setaf 15)
+
+### Local variables
+STARTDIR="$(pwd)"
+SCRIPTFILENAME=$(basename $0)
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+MOTD="/etc/motd"
+DOTFILES_DIR='/etc/dotfiles.d'
+DOTFILES_URL='https://github.com/ULHPC/dotfiles.git'
+SUPPORT_MAIL='hpc-sysadmins@uni.lu'
+EXTRA_PACKAGES=
+
+# List of default packages to install
+COMMON_DEFAULT_PACKAGES="ruby wget figlet git screen bash-completion rsync vim"
+
+GEMS="librarian-puppet falkorlib"
+
+######
+# Print information in the following form: '[$2] $1' ($2=INFO if not submitted)
+# usage: info text [title]
+##
+info () {
+    echo
+    echo "${SETCOLOR_BOLD}###${SETCOLOR_NORMAL} ${SETCOLOR_TITLE}${1}${SETCOLOR_NORMAL} ${SETCOLOR_BOLD}###${SETCOLOR_NORMAL}"
+}
+error() {
+    echo
+    echo "${SETCOLOR_RED}*** ERROR *** $*${SETCOLOR_NORMAL}"
+    exit 1
+}
+
+print_usage() {
+    cat <<EOF
+    $0 [--name "vagrant box name"] \
+       [--title "Title"] \
+       [--subtitle "Subtitle"] \
+       [--desc "description"] \
+       [--support "support@mail.com"]
+       [-x "pkg1 pkg2 ..."]
+
+Bootstrap a Vagrant box
+This will generate the appropriate ${MOTD} file
+EOF
+}
+
+#######################  Per OS Bootstrapping function ##########################
+setup_redhat() {
+    info "Running yum update"
+    yum update -y  >/dev/null
+
+    info "Installing default packages"
+    yum install -y epel-release
+    yum install -y ${COMMON_DEFAULT_PACKAGES} ruby-devel bind-utils ${EXTRA_PACKAGES}  >/dev/null
+
+    info "Uninstalling (eventually) existing Puppet installation"
+    yum erase -y puppet puppetlabs-release >/dev/null
+
+    info "Adding repo for Puppet 4"
+    rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-pc1-el-$1.noarch.rpm
+
+    sleep 1
+    info "Installing Puppet and its dependencies"
+    yum install -y puppet-agent >/dev/null
+}
+
+setup_apt() {
+    case $1 in
+        3*) codename=cumulus ;;
+        6)  codename=squeeze ;;
+        7)  codename=wheezy ;;
+        8)  codename=jessie  ;;
+        9)  codename=stretch  ;;
+        12.04) codename=precise ;;
+        14.04) codename=trusty  ;;
+        16.04) codename=xenial ;;
+        *) echo "Release not supported" ;;
+    esac
+
+    info "Adding repo for Puppet 4"
+    wget -q "http://apt.puppetlabs.com/puppetlabs-release-pc1-${codename}.deb" >/dev/null
+    dpkg -i "puppetlabs-release-pc1-${codename}.deb" >/dev/null
+
+    info "Running apt-get update"
+    apt-get update >/dev/null 2>&1
+
+    info "Installing default packages"
+    apt-get install -y ${COMMON_DEFAULT_PACKAGES} git-core rubygems ${EXTRA_PACKAGES}  >/dev/null
+
+    info "Installing Puppet and its dependencies"
+    apt-get install puppet-agent -y >/dev/null
+    apt-get install apt-transport-https -y >/dev/null
+}
+
+setup_linux() {
+    ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
+    if [ -f /etc/redhat-release ]; then
+        OS=$(cat /etc/redhat-release | cut -d ' ' -f 1)
+        majver=$(cat /etc/redhat-release | sed 's/[A-Za-z]*//g' | sed 's/ //g' | cut -d '.' -f 1)
+    elif [ -f /etc/SuSE-release ]; then
+        OS=sles
+        majver=$(cat /etc/SuSE-release | grep VERSION | cut -d '=' -f 2 | tr -d '[:space:]')
+    elif [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS=$ID
+        majver=$VERSION_ID
+    elif [ -f /etc/debian_version ]; then
+        OS=Debian
+        majver=$(cat /etc/debian_version | cut -d '.' -f 1)
+    elif [ -f /etc/lsb-release ]; then
+        . /etc/lsb-release
+        OS=$DISTRIB_ID
+        majver=$DISTRIB_RELEASE
+    elif [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS=$ID
+        majver=$VERSION_ID
+    else
+        OS=$(uname -s)
+        majver=$(uname -r)
+    fi
+    distro=$(echo $OS | tr '[:upper:]' '[:lower:]')
+    info "Detected Linux distro: ${distro} version ${majver} on arch ${ARCH}"
+    case "$distro" in
+        debian|ubuntu) setup_apt $majver ;;
+        redhat|fedora|centos|scientific|amazon) setup_redhat $majver ;;
+        *) echo "Not supported distro: $distro"; exit 1;;
+    esac
+
+}
+
+setup_dotfiles () {
+    if [ ! -d "${DOTFILES_DIR}" ]; then
+        info "cloning ULHPC/dotfiles repository in '/etc/dotfiles.d"
+        git clone ${DOTFILES_URL} ${DOTFILES_DIR}
+    fi
+    # Correct __git_ps1
+    local src_git_prompt="/usr/share/git-core/contrib/completion/git-prompt.sh"
+    local dst_git_prompt="/etc/profile.d/git-prompt.sh"
+    if [ -f "${src_git_prompt}" ]; then
+        info "installing git-prompt to define __git_ps1"
+        [ ! -e "${dst_git_prompt}" ] && ln -s ${src_git_prompt} ${dst_git_prompt}
+    fi
+    local dotfile_install_cmd="${DOTFILES_DIR}/install.sh --offline --force -d ${DOTFILES_DIR} --bash --screen"
+    if [ -d "${DOTFILES_DIR}" ]; then
+        info "installing dotfiles for 'root' user"
+        ${dotfile_install_cmd}
+        info "installing dotfiles for 'vagrant' user"
+        sudo -u vagrant ${dotfile_install_cmd}
+    fi
+}
+
+setup_motd() {
+    local motd=/etc/motd
+    local has_figlet=$(which figlet 2>/dev/null)
+    info "setup ${motd}"
+    cat <<EOF > ${motd}
+================================================================================
+ Welcome to the Vagrant box $(hostname)
+================================================================================
+EOF
+    if [ -n "${has_figlet}" ]; then
+        cat <<EOF >> ${motd}
+$(${has_figlet} -w 80 -c "$(hostname -s)")
+EOF
+    fi
+    cat <<EOF >> ${motd}
+================================================================================
+    Hostname.... $(hostname -f)
+    OS.......... $(facter os.name) $(facter os.release.full)
+    Support..... ${SUPPORT_MAIL}
+    Docs........ Vagrant: http://docs.vagrantup.com/v2/
+================================================================================
+EOF
+}
+
+setup_gems() {
+    sudo gem install --no-ri --no-rdoc ${GEMS}
+}
+
+######################################################################################
+[ $UID -gt 0 ] && error "You must be root to execute this script (current uid: $UID)"
+
+
+# Parse the command-line options
+while [ $# -ge 1 ]; do
+    case $1 in
+        -h | --help)    print_usage;       exit 0;;
+        -V | --version) print_version;     exit 0;;
+        -n | --name)      shift; NAME=$1;;
+        -t | --title)     shift; TITLE=$1;;
+        -st| --subtitle)  shift; SUBTITLE=$1;;
+        -d | --desc)      shift; DESC=$1;;
+        -s | --support)   shift; SUPPORT_MAIL=$1;;
+        -x | --extras)    shift; EXTRA_PACKAGES=$1;;
+    esac
+    shift
+done
+
+# Let's go
+case "$OSTYPE" in
+    linux*)   setup_linux ;;
+    *)        echo "unknown: $OSTYPE"; exit 1;;
+esac
+
+[ -f /usr/bin/puppet ] || ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
+[ -f /usr/bin/facter ] || ln -s /opt/puppetlabs/puppet/bin/facter /usr/bin/facter
+
+setup_dotfiles
+setup_motd
+setup_gems
diff --git a/tests/vagrant/config.yaml b/tests/vagrant/config.yaml
new file mode 100644
index 0000000..665b392
--- /dev/null
+++ b/tests/vagrant/config.yaml
@@ -0,0 +1,51 @@
+# -*- mode: yaml; -*-
+# Time-stamp: <Mon 2017-08-21 23:15 svarrette>
+################################################################################
+# Complementary configuration for Vagrant
+# You can overwrite here the default settings defined in ../../Vagrantfile and
+# define additional VMs (agents) to deploy upon vagrant up (in addition to the
+# puppet master 'master')
+
+#___________________________________________
+# Complete / re-define the default boxes below
+# Format:
+#   :<os><version>: <username>/<box> # see https://vagrantcloud.com
+# :boxes:
+#   :windows2012: 'opentable/win-2012r2-standard-amd64-nocm'
+#   :freebsd12:   'freebsd/FreeBSD-12.0-RELEASE'
+#   :centos7:     'centos/7',
+#   :debian8:     'debian/contrib-jessie64',
+#   :ubuntu14:    'ubuntu/trusty64'
+
+#_________________
+# Default settings
+# :defaults:
+#   :os: :centos7         # Default OS from the above box definition
+#   :ram: 512             # Default RAM
+#   :vcpus: 1             # Default number of virtual CPUs
+#   :vbguest_auto_update: 1  # check/update box guest additions
+
+#____________________
+# Network settings
+# :network:
+#   :domain: 'vagrant.dev'      # network domain to use
+#   :range: '10.10.1.0/24'      # IP range to use
+#   :ip_offset: 10
+#   # client / VMs defined below will start on xx.xx.xx.<ip_offset>
+
+#___________________________________________________________
+# VMs / Vagrant boxes to define apart from the puppet master
+# Format:
+# <name>:
+#   :hostname: <hostname>
+#   :desc: <VM-description>
+#   :os: <os>
+#   :ram: <ram>
+#   :vcpus: <vcpus>
+#   :role: <role>
+#   :roles:
+#     - <role1>
+#     - <role2>
+# :vms:
+#   'default':
+#     :os: :debian8
diff --git a/tests/vagrant/puppet_modules_setup.rb b/tests/vagrant/puppet_modules_setup.rb
new file mode 100755
index 0000000..ff4be0e
--- /dev/null
+++ b/tests/vagrant/puppet_modules_setup.rb
@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+##########################################################################
+# puppet_module_setup.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Mon 2017-08-21 13:01 svarrette>
+#
+# @description Prepare the Vagrant box to test this Puppet module
+#
+# Copyright (c) 2014-2017 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'json'
+require 'yaml'
+require 'falkorlib'
+
+include FalkorLib::Common
+
+# Load metadata
+basedir   = File.directory?('/vagrant') ? '/vagrant' : Dir.pwd
+jsonfile  = File.join( basedir, 'metadata.json')
+puppetdir = '/etc/puppetlabs'
+
+error "Unable to find the metadata.json" unless File.exists?(jsonfile)
+
+metadata   = JSON.parse( IO.read( jsonfile ) )
+name = metadata["name"].gsub(/^[^\/-]+[\/-]/,'')
+modulepath=`puppet config print modulepath`.chomp
+moduledir=modulepath.split(':').first
+
+
+run %{ cd #{moduledir}/.. && librarian-puppet clean && rm Puppetfile* }
+run %{ ln -s /vagrant/metadata.json #{moduledir}/../ }
+run %{ cd #{moduledir}/.. && librarian-puppet install --verbose }
+
+
+# metadata["dependencies"].each do |dep|
+# 	lib = dep["name"]
+#     shortname = lib.gsub(/^.*[\/-]/,'')
+#     action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
+# 	run %{ puppet module #{action} #{lib} }
+# end
+
+puts "Module path: #{modulepath}"
+puts "Moduledir:   #{moduledir}"
+
+info "set symlink to the '#{basedir}' module for local developments"
+run %{ ln -s #{basedir} #{moduledir}/#{name}  } unless File.exists?("#{moduledir}/#{name}")
+
+# Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5
+hiera = '/etc/puppetlabs/puppet/hiera.yaml'
+
+
+
+
+# Prepare hiera
+# unless File.exists?('/etc/puppet/hiera.yaml')
+#     run %{ ln -s /etc/hiera.yaml /etc/puppet/hiera.yaml } if File.exists?("/etc/hiera.yaml")
+# end
+# # # hieracfg = YAML::load_file('/etc/hiera.yaml')
+# # # [ '/vagrant/tests/hiera' ].each do |d|
+# # #     hieracfg[:datadir] = [] if hieracfg[:datadir].nil?
+# # #     hieracfg[:datadir] << d #if File.directory?('#{d}')
+# # # end
+# # # hieracfg[:hierarchy] = [] if hieracfg[:hierarchy].nil?
+# # # hieracfg[:hierarchy] << 'common' unless hieracfg[:hierarchy].include?('common')
+# hieracfg = {
+#     :backends  => [ 'yaml' ],
+#     :hierarchy => [ 'defaults', 'common' ],
+#     :yaml      => {
+#         :datadir   => '/vagrant/tests/hiera',
+#     }
+# }
+# FalkorLib::Common.store_config('/etc/hiera.yaml', hieracfg, {:no_interaction => true})

From 5c1d2ed349a2c18e3af9fb2f238469a536c7c03f Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 14:53:16 +0200
Subject: [PATCH 16/32] ulimit::rule now suppports content and source

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 files/test.conf         | 14 ++++++++++
 manifests/params.pp     | 36 ++++++++++++-------------
 manifests/rule.pp       | 53 +++++++++++++++++++++++++++----------
 metadata.json           |  2 +-
 templates/rule.conf.erb |  2 +-
 templates/test.erb      | 18 +++++++++++++
 tests/init.pp           | 19 +++++++++++++-
 tests/rule.pp           | 58 +++++++++++++++++++++++++++++++++++++++++
 8 files changed, 167 insertions(+), 35 deletions(-)
 create mode 100644 files/test.conf
 create mode 100644 templates/test.erb
 create mode 100644 tests/rule.pp

diff --git a/files/test.conf b/files/test.conf
new file mode 100644
index 0000000..12d1731
--- /dev/null
+++ b/files/test.conf
@@ -0,0 +1,14 @@
+# -*- mode: conf; -*-
+###################################################################################
+# /!\ DO NOT EDIT THIS FILE: It has been automatically generated by Puppet.
+#  In particular, any further changes will be overwritten at the next puppet
+#  invocation
+###################################################################################
+# Direct source example
+#
+# <domain> <type> <item> <value>
+#
+*		hard		memlock		unlimited
+*		soft		memlock		unlimited
+*		hard		nproc		10240
+*		soft		nproc		10240
diff --git a/manifests/params.pp b/manifests/params.pp
index 7d3d0dc..ad1b024 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Thu 2017-10-05 11:37 svarrette>
+# Time-stamp: <Thu 2017-10-05 13:02 svarrette>
 #
 # File::      <tt>params.pp</tt>
 # Author::    Tom De Vylder, Sebastien Varrette
@@ -40,36 +40,36 @@
         # pam package on EL6 creates 90-nproc.conf
         $default_ulimits = {
           'nproc_user_defaults' => {
-            'priority'          => '90',
+            'priority'          => 90,
             'ulimit_domain'     => '*',
-            'ulimit_item'       => ['nproc'],
-            'ulimit_type'       => ['soft'],
-            'ulimit_value'      => ['1024'],
+            'ulimit_item'       => 'nproc',
+            'ulimit_type'       => 'soft',
+            'ulimit_value'      => '1024',
           },
           'nproc_root_defaults' => {
-            'priority'          => '90',
+            'priority'          => 90,
             'ulimit_domain'     => 'root',
-            'ulimit_item'       => ['nproc'],
-            'ulimit_type'       => ['soft'],
-            'ulimit_value'      => ['unlimited'],
+            'ulimit_item'       => 'nproc',
+            'ulimit_type'       => 'soft',
+            'ulimit_value'      => 'unlimited',
           },
         }
       } elsif $::operatingsystemmajrelease == '7' {
         # pam package on EL7 creates 20-nproc.conf
         $default_ulimits = {
           'nproc_user_defaults' => {
-            'priority'          => '20',
+            'priority'          => 20,
             'ulimit_domain'     => '*',
-            'ulimit_item'       => ['nproc'],
-            'ulimit_type'       => ['soft'],
-            'ulimit_value'      => ['4096'],
+            'ulimit_item'       => 'nproc',
+            'ulimit_type'       => 'soft',
+            'ulimit_value'      => '4096',
           },
           'nproc_root_defaults' => {
-            'priority'          => '20',
-            'ulimit_domain'     => ['root'],
-            'ulimit_item'       => ['nproc'],
-            'ulimit_type'       => ['soft'],
-            'ulimit_value'      => ['unlimited'],
+            'priority'          => 20,
+            'ulimit_domain'     => 'root',
+            'ulimit_item'       => 'nproc',
+            'ulimit_type'       => 'soft',
+            'ulimit_value'      => 'unlimited',
           },
         }
       } else {
diff --git a/manifests/rule.pp b/manifests/rule.pp
index ca8097d..9452a87 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Thu 2017-10-05 12:08 svarrette>
+# Time-stamp: <Thu 2017-10-05 14:45 svarrette>
 #
 # File::      <tt>rule.pp</tt>
 # Author::    Tom De Vylder, Sebastien Varrette
@@ -15,9 +15,22 @@
 #
 # @param ensure [String] Default: 'present'.
 #          Ensure the presence (or absence) of the ulimit rule
+# @param content [String]
+#          The desired contents of a file, as a string. This attribute is
+#          mutually exclusive with source and target.
+#          See also
+#          https://docs.puppet.com/puppet/latest/types/file.html#file-attribute-content
 # @param priority      [Integer] Default: 80
 #          Priority of the file, i.e. this rule will create the file
 #          '/etc/security/limits.d/<priority>_<label>'
+# @param source  [String]
+#          A source file, which will be copied into place on the local system.
+#          This attribute is mutually exclusive with content and target.
+#          See also
+#          https://docs.puppet.com/puppet/latest/types/file.html#file-attribute-source
+# @param target  [String]
+#          See also
+#          https://docs.puppet.com/puppet/latest/types/file.html#file-attribute-target
 # @param ulimit_domain [String] Default: '*'
 #          ulimit Domain, which can be:
 #                     - an user name
@@ -65,38 +78,50 @@
     'present',
     'absent'
   ]       $ensure        = 'present',
+  $content               = undef,
   Integer $priority      = 80,
+  $source                = undef,
+  $target                = undef,
   String  $ulimit_domain = '*',
   $ulimit_type           = undef,
   $ulimit_item           = undef,
-  String $ulimit_value   = '',
+  String  $ulimit_value  = '',
 )
 {
   require ::ulimit
   include ::ulimit::config
 
-  if ($ulimit_type == undef or $ulimit_item == undef or empty($ulimit_value)) {
-    fail("${module_name} requires the definition of type, item and/or value")
+  if ($content == undef and $source == undef and $target == undef) {
+    if ($ulimit_type == undef or $ulimit_item == undef or empty($ulimit_value)) {
+      fail("${module_name} requires the definition of type, item and/or value")
+    }
+    if ! $ulimit_type.is_a(String) and (! $ulimit_type.is_a(Array)) {
+      fail("Parameters ulimit_type is expected to be a string or an Array")
+    }
+    if ! $ulimit_item.is_a(String) and ! $ulimit_item.is_a(Array) {
+      fail("Parameters ulimit_item is expected to be a string or an Array")
+    }
   }
-  if ! $ulimit_type.is_a?(String) and ! $ulimit_type.is_a?(Array) {
-    fail("Parameters ulimit_type is expected to be a string or an Array")
-  }
-  if ! $ulimit_item.is_a?(String) and ! $ulimit_item.is_a?(Array) {
-    fail("Parameters ulimit_item is expected to be a string or an Array")
-  }
-
-  $types = $ulimit_type.is_a?(String) {
+  $types = $ulimit_type.is_a(String) ? {
     true    => [ $ulimit_type ],
     default => $ulimit_type,
   }
-  $items = $ulimit_item.is_a?(String) {
+  $items = $ulimit_item.is_a(String) ? {
     true    => [ $ulimit_item ],
     default => $ulimit_item,
   }
+  $real_content = ($content == undef) ? {
+    true => ($source == undef) ? {
+      true    => template('ulimit/rule.conf.erb'),
+      default => undef,
+    },
+    default => $content,
+  }
 
   file { "${::ulimit::config_dir}/${priority}_${name}.conf":
     ensure  => $ensure,
-    content => template ('ulimit/rule.conf.erb'),
+    content => $real_content,
+    source  => $source,
     require => File[$::ulimit::config_dir],
   }
 
diff --git a/metadata.json b/metadata.json
index ff875ff..a57b5b4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -11,7 +11,7 @@
     {
       "name": "puppetlabs-stdlib",
       "version_requirement": ">=4.2.2 <5.0.0"
-    },
+    }
   ],
   "description": "ulimit",
   "tags": [
diff --git a/templates/rule.conf.erb b/templates/rule.conf.erb
index 1d67739..62fac06 100644
--- a/templates/rule.conf.erb
+++ b/templates/rule.conf.erb
@@ -12,6 +12,6 @@
 #
 <% @types.each do |type| -%>
 <%    @items.each do |item| -%>
-<%= @ulimit_domain %>  <%= @type %> <%= @item %> <%= @ulimit_value %>
+<%= @ulimit_domain.ljust(6) %>  <%= type.ljust(12) %> <%= item.ljust(12) %> <%= @ulimit_value %>
 <%    end -%>
 <% end -%>
diff --git a/templates/test.erb b/templates/test.erb
new file mode 100644
index 0000000..34ed552
--- /dev/null
+++ b/templates/test.erb
@@ -0,0 +1,18 @@
+# -*- mode: conf; -*-
+#####################################################################################
+# <%= scope['ulimit::config_dir'] %>/<%= @priority %>_<%= @name %>.conf
+#
+###################################################################################
+# /!\ DO NOT EDIT THIS FILE: It has been automatically generated by Puppet.
+#  In particular, any further changes will be overwritten at the next puppet
+#  invocation
+###################################################################################
+#
+# <domain> <type> <item> <value>
+#
+*		hard		memlock		unlimited
+*		soft		memlock		unlimited
+*		hard		nproc		10240
+*		soft		nproc		10240
+*		hard		stack		unlimited
+*		soft		stack		unlimited
diff --git a/tests/init.pp b/tests/init.pp
index a17a540..11d3777 100644
--- a/tests/init.pp
+++ b/tests/init.pp
@@ -1 +1,18 @@
-include ulimit
+# The baseline for module testing used by Puppet Labs is that each manifest
+# should have a corresponding test manifest that declares that class or defined
+# type.
+#
+# Tests are then run by using puppet apply --noop (to check for compilation
+# errors and view a log of events) or by fully applying the test in a virtual
+# environment (to compare the resulting system state to the desired state).
+#
+# Learn more about module testing here
+# http://docs.puppetlabs.com/guides/tests_smoke.html
+#
+# You can execute this manifest as follows in your vagrant box
+#
+#      sudo puppet apply -vt /vagrant/tests/init.pp
+#
+node default {
+  include ::ulimit
+}
diff --git a/tests/rule.pp b/tests/rule.pp
new file mode 100644
index 0000000..40e2372
--- /dev/null
+++ b/tests/rule.pp
@@ -0,0 +1,58 @@
+#
+# You can execute this manifest as follows in your vagrant box
+#
+#      sudo puppet apply -vt /vagrant/tests/rule.pp
+#
+node default {
+  include ::ulimit
+
+  # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
+  # following content:
+  #
+  # /etc/security/limits.d/80_slurm.conf
+  # [...]
+  # *       soft         memlock      unlimited
+  # *       soft         stack        unlimited
+  # *       hard         memlock      unlimited
+  # *       hard         stack        unlimited
+  #
+  ::ulimit::rule{ 'slurm':
+    ensure        => 'present',
+    ulimit_domain => '*',
+    ulimit_type   => [ 'soft', 'hard' ],
+    ulimit_item   => [ 'memlock', 'stack' ],
+    ulimit_value  => 'unlimited',
+  }
+
+  # Below statement should create '/etc/security/limits.d/50_slurm-nproc.conf'
+  # with the following content:
+  #
+  # *       soft         nproc        10240
+  # *       hard         nproc        10240
+  #
+  ::ulimit::rule{ 'slurm-nproc':
+    ensure        => 'present',
+    priority      => 50,
+    ulimit_domain => '*',
+    ulimit_type   => [ 'soft', 'hard' ],
+    ulimit_item   => 'nproc',
+    ulimit_value  => '10240',
+  }
+
+  # You can also pass the content yourself -- below statement will create
+  # '/etc/security/limits.d/60_content.conf' with that content
+  ::ulimit::rule{ 'content':
+    ensure   => 'present',
+    priority => 60,
+    content  => template('ulimit/test.erb'),
+  }
+
+  # ... or pass directly the source file -- below statement will create
+  # '/etc/security/limits.d/70_source.conf' with that content
+  ::ulimit::rule{ 'source':
+    ensure        => 'present',
+    priority      => 70,
+    source        => 'puppet:///modules/ulimit/test.conf',
+  }
+
+}

From 0e15d4a9fde42016f0ffccc5130382b00c219964 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 14:54:57 +0200
Subject: [PATCH 17/32] lint

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 manifests/rule.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/rule.pp b/manifests/rule.pp
index 9452a87..cd2fe3d 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Thu 2017-10-05 14:45 svarrette>
+# Time-stamp: <Thu 2017-10-05 14:54 svarrette>
 #
 # File::      <tt>rule.pp</tt>
 # Author::    Tom De Vylder, Sebastien Varrette
@@ -76,8 +76,8 @@
 define ulimit::rule (
   Enum[
     'present',
-    'absent'
-  ]       $ensure        = 'present',
+    'absent',
+  ] $ensure              = 'present',
   $content               = undef,
   Integer $priority      = 80,
   $source                = undef,
@@ -96,10 +96,10 @@
       fail("${module_name} requires the definition of type, item and/or value")
     }
     if ! $ulimit_type.is_a(String) and (! $ulimit_type.is_a(Array)) {
-      fail("Parameters ulimit_type is expected to be a string or an Array")
+      fail('Parameters ulimit_type is expected to be a string or an Array')
     }
     if ! $ulimit_item.is_a(String) and ! $ulimit_item.is_a(Array) {
-      fail("Parameters ulimit_item is expected to be a string or an Array")
+      fail('Parameters ulimit_item is expected to be a string or an Array')
     }
   }
   $types = $ulimit_type.is_a(String) ? {

From 20e04078931c965bee5e11793c6fdeb824bb7de2 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 14:55:15 +0200
Subject: [PATCH 18/32] bump to version '1.0.0'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index a57b5b4..31ccb6a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "0.1.1",
+  "version": "1.0.0",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his module",
   "license": "Apache License, Version 2.0",
@@ -62,4 +62,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file

From 52a6d4ad3efc899cfc390e02e188a44cd105a1cf Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 15:51:16 +0200
Subject: [PATCH 19/32] update readme

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 README.md     | 157 +++++++++++++++++++++++++++++++++++++++++---------
 metadata.json |  37 +++---------
 tests/rule.pp |  16 ++++-
 3 files changed, 150 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index f1390c2..6fe3ba3 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,120 @@
-# Puppet Ulimit
+-*- mode: markdown; mode: visual-line;  -*-
 
-## Requirements
+# Ulimit Puppet Module
 
-## Tested on...
+[![Puppet Forge](http://img.shields.io/puppetforge/v/svarrette/ulimit.svg)](https://forge.puppet.com/svarrette/ulimit) [![License](http://img.shields.io/:license-Apache2.0-blue.svg)](LICENSE) ![Supported Platforms](http://img.shields.io/badge/platform-debian|redhat|centos-lightgrey.svg)
+
+      Copyright (c) 2015-2017 Tom De Vylder (aka arioch), Sebastien Varrette (aka Falkor)
+
+[ulimit](https://ss64.com/bash/ulimit.html) provides control over the resources available to the shell and to processes started by it, on systems that allow such control.
+
+This [Puppet](https://puppet.com/) module is designed to configure and manage ulimits on your Linux system, mainly with the `ulimit::rule` definition which permits to define soft  and/or hard limits over various domains.
+
+* The soft limit is the value that the kernel enforces for the corresponding resource.
+* The hard limit acts as a ceiling for the soft limit.
+
+
+**`/! IMPORTANT`: This module is a fork from [arioch/puppet-ulimit](https://github.com/arioch/puppet-ulimit/)!!!**
+This was done to allow a version release on my own namespace compliant with Puppet 4 until [Tom/arioch](https://github.com/arioch) released the official new version on his module.
+In the mean time, I added more features (vagrant-based tests, support for arrays, content and source) yet **this module is expected to disappear** once [Tom/arioch](https://github.com/arioch) (hopefully) integrate my pull-request.
+
+In particular, this module implements the following elements:
+
+* class `ulimit`: The main class, piloting all aspects of the configuration
+* class `ulimit::config`: an **internal** class taking care of global configurations and defaults
+* definition `ulimit::rule`: permiting to define a rule in `'/etc/security/limits.d/'`
+
+All these components are configured through a set of variables you will find in [`manifests/params.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/manifests/params.pp).
+
+### Setup Requirements
+
+This module have been successfully over Puppet 4.x. with:
 
 * Debian 5 (Lenny)
 * Debian 6 (Squeeze)
 * CentOS 5
 * CentOS 6
 * CentOS 7
+* RedHat 6
+* RedHat 7
 
-## Example usage
+Over operating systems and support for Puppet 5.x will eventually be added.
+Yet feel free to contribute to this module to help us extending the usage of this module.
+
+## Forge Module Dependencies
+
+See [`metadata.json`](https://github.com/Falkor/puppet-ulimit/blob/master/metadata.json).
+In particular, this module depends on
+
+* [puppetlabs/stdlib](https://forge.puppetlabs.com/puppetlabs/stdlib)
+
+## Overview and Usage
+
+See also [`tests/rule.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/tests/rule.pp)
+
+```ruby
+  include ::ulimit
+
+  # This will create the file '/etc/security/limits.d/80_example1.conf' with the
+  # following content:
+  # *       soft         nofile      1024
+  ::ulimit::rule{ 'example1':
+      ulimit_domain => '*',
+      ulimit_type   => 'soft',
+      ulimit_item   => 'nofile',
+      ulimit_value  => '1024',
+  }
+
+  # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
+  # following content:
+  #
+  # /etc/security/limits.d/80_slurm.conf
+  # [...]
+  # *       soft         memlock      unlimited
+  # *       soft         stack        unlimited
+  # *       hard         memlock      unlimited
+  # *       hard         stack        unlimited
+  #
+  ::ulimit::rule{ 'slurm':
+      ensure        => 'present',
+      ulimit_domain => '*',
+      ulimit_type   => [ 'soft', 'hard' ],
+      ulimit_item   => [ 'memlock', 'stack' ],
+      ulimit_value  => 'unlimited',
+  }
+
+  # Below statement should create '/etc/security/limits.d/50_slurm-nproc.conf'
+  # with the following content:
+  #
+  # *       soft         nproc        10240
+  # *       hard         nproc        10240
+  #
+  ::ulimit::rule{ 'slurm-nproc':
+      ensure        => 'present',
+      priority      => 50,
+      ulimit_domain => '*',
+      ulimit_type   => [ 'soft', 'hard' ],
+      ulimit_item   => 'nproc',
+      ulimit_value  => '10240',
+  }
+
+  # You can also pass the content yourself -- below statement will create
+  # '/etc/security/limits.d/60_content.conf' with that content
+  ::ulimit::rule{ 'content':
+      ensure   => 'present',
+      priority => 60,
+      content  => template('ulimit/test.erb'),
+  }
+
+  # ... or pass directly the source file -- below statement will create
+  # '/etc/security/limits.d/70_source.conf' with that content
+  ::ulimit::rule{ 'source':
+      ensure   => 'present',
+      priority => 70,
+      source   => 'puppet:///modules/ulimit/test.conf',
+  }
+```
 
-    node /box/ {
-      include ulimit
-
-      ulimit::rule {
-        'example1':
-          ulimit_domain => '*',
-          ulimit_type   => ['soft'],
-          ulimit_item   => ['nofile'],
-          ulimit_value  => ['1024'];
-
-        'example2':
-          ensure        => absent,
-          ulimit_domain => '*',
-          ulimit_type   => ['hard'],
-          ulimit_item   => ['nofile'],
-          ulimit_value  => ['50000'];
-
-        'example3':
-          ulimit_domain => '*',
-          ulimit_type   => ['soft', 'soft'],
-          ulimit_item   => ['nofile', 'nproc''],
-          ulimit_value  => ['1024', 'unlimited'];
-      }
-    }
 
 ## Caveats
 
@@ -48,3 +127,25 @@ While not advised you can disable this feature:
       }
     }
 
+## Developments / Contributing to the code
+
+You are more than welcome to contribute to the development of this module.
+Kindly proceed as follows:
+
+1. Fork it
+2. Create your feature branch (`git checkout -b feature/<name>`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git flow feature publish <name>`)
+5. Create new [Pull request](https://help.github.com/articles/using-pull-requests).
+
+## Puppet modules tests within a Vagrant box
+
+The best way to test this module in a non-intrusive way is to rely on [Vagrant](http://www.vagrantup.com/).
+The `Vagrantfile` at the root of the repository pilot the provisioning various vagrant boxes available on [Vagrant cloud](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=virtualbox&q=svarrette) you can use to test this module.
+
+## Licence
+
+This project and the sources proposed within this repository are released under the terms of the [Apache-2.0](LICENCE) licence.
+
+
+[![Licence](https://www.apache.org/images/feather-small.gif)](LICENSE)
diff --git a/metadata.json b/metadata.json
index 31ccb6a..2b7ed3f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -21,45 +21,24 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "6.0",
-        "6.1",
-        "6.2",
-        "6.3",
-        "6.4",
-        "6.5",
-        "6.6",
-        "6.6",
-        "6.7",
-        "6.9",
-        "7.0",
-        "7.1",
-        "7.2",
-        "7.3",
-        "7.4",
-        "7.5"
+          "6",
+          "7",
+          "8"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6.0",
-        "6.1",
-        "6.2",
-        "6.3",
-        "6.4",
-        "6.5"
+          "6",
+          "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6.0",
-        "6.1",
-        "6.2",
-        "6.3",
-        "6.4",
-        "6.5"
+          "6",
+          "7",
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/rule.pp b/tests/rule.pp
index 40e2372..9d46779 100644
--- a/tests/rule.pp
+++ b/tests/rule.pp
@@ -6,6 +6,16 @@
 node default {
   include ::ulimit
 
+  # This will create the file '/etc/security/limits.d/80_example1.conf' with the
+  # following content:
+  # *       soft         nofile      1024
+  ::ulimit::rule{ 'example1':
+    ulimit_domain => '*',
+    ulimit_type   => 'soft',
+    ulimit_item   => 'nofile',
+    ulimit_value  => '1024',
+  }
+
   # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
   # following content:
   #
@@ -50,9 +60,9 @@
   # ... or pass directly the source file -- below statement will create
   # '/etc/security/limits.d/70_source.conf' with that content
   ::ulimit::rule{ 'source':
-    ensure        => 'present',
-    priority      => 70,
-    source        => 'puppet:///modules/ulimit/test.conf',
+    ensure   => 'present',
+    priority => 70,
+    source   => 'puppet:///modules/ulimit/test.conf',
   }
 
 }

From 9efb6005d4718cc6d4ac50271df7c12edffef92b Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 15:51:51 +0200
Subject: [PATCH 20/32] metadata correction

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 2b7ed3f..aef072f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -37,7 +37,7 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
           "6",
-          "7",
+          "7"
       ]
     }
   ]

From efbb92592d98f01bbae129bb8be2579f58b02be5 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 15:52:06 +0200
Subject: [PATCH 21/32] bump to version '1.0.1'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/metadata.json b/metadata.json
index aef072f..fe3afcc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his module",
   "license": "Apache License, Version 2.0",
@@ -21,24 +21,24 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-          "6",
-          "7",
-          "8"
+        "6",
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-          "6",
-          "7"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-          "6",
-          "7"
+        "6",
+        "7"
       ]
     }
   ]
-}
+}
\ No newline at end of file

From d340ff79742c9ca5ea6c64718f89687900c259e9 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:00:11 +0200
Subject: [PATCH 22/32] final tests on vagrant

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 README.md         | 19 ++++++++++++++++++-
 manifests/rule.pp |  9 ++++-----
 tests/rule.pp     | 32 +++++++++++++++++++++++++-------
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 6fe3ba3..fd7f980 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,9 @@ See also [`tests/rule.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/t
 
   # This will create the file '/etc/security/limits.d/80_example1.conf' with the
   # following content:
+  #
   # *       soft         nofile      1024
+  #
   ::ulimit::rule{ 'example1':
       ulimit_domain => '*',
       ulimit_type   => 'soft',
@@ -65,10 +67,23 @@ See also [`tests/rule.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/t
       ulimit_value  => '1024',
   }
 
+  # This will create the file '/etc/security/limits.d/80_example2.conf' with the
+  # following content:
+  #
+  # *       hard         nproc        1024
+  # *       hard         nofile       1024
+  #
+  ::ulimit::rule{ 'example2':
+    ensure        => 'present,
+    ulimit_domain => '*',
+    ulimit_type   => 'hard',
+    ulimit_item   => [ 'nproc', 'nofile' ],
+    ulimit_value  => '1024',
+  }
+
   # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
   # following content:
   #
-  # /etc/security/limits.d/80_slurm.conf
   # [...]
   # *       soft         memlock      unlimited
   # *       soft         stack        unlimited
@@ -100,6 +115,7 @@ See also [`tests/rule.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/t
 
   # You can also pass the content yourself -- below statement will create
   # '/etc/security/limits.d/60_content.conf' with that content
+  #
   ::ulimit::rule{ 'content':
       ensure   => 'present',
       priority => 60,
@@ -108,6 +124,7 @@ See also [`tests/rule.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/t
 
   # ... or pass directly the source file -- below statement will create
   # '/etc/security/limits.d/70_source.conf' with that content
+  #
   ::ulimit::rule{ 'source':
       ensure   => 'present',
       priority => 70,
diff --git a/manifests/rule.pp b/manifests/rule.pp
index cd2fe3d..4595a19 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Thu 2017-10-05 14:54 svarrette>
+# Time-stamp: <Thu 2017-10-05 16:54 svarrette>
 #
 # File::      <tt>rule.pp</tt>
 # Author::    Tom De Vylder, Sebastien Varrette
@@ -74,10 +74,7 @@
 #          Value to set for the domain / type
 #
 define ulimit::rule (
-  Enum[
-    'present',
-    'absent',
-  ] $ensure              = 'present',
+  String $ensure         = 'present',
   $content               = undef,
   Integer $priority      = 80,
   $source                = undef,
@@ -88,6 +85,8 @@
   String  $ulimit_value  = '',
 )
 {
+  validate_legacy('String', 'validate_re', $ensure, ['^present', '^absent'])
+
   require ::ulimit
   include ::ulimit::config
 
diff --git a/tests/rule.pp b/tests/rule.pp
index 9d46779..5271f0c 100644
--- a/tests/rule.pp
+++ b/tests/rule.pp
@@ -5,21 +5,37 @@
 #
 node default {
   include ::ulimit
+  $ensure = 'present'  #  'absent'
 
   # This will create the file '/etc/security/limits.d/80_example1.conf' with the
   # following content:
+  #
   # *       soft         nofile      1024
+  #
   ::ulimit::rule{ 'example1':
+    ensure        => $ensure,
     ulimit_domain => '*',
     ulimit_type   => 'soft',
     ulimit_item   => 'nofile',
     ulimit_value  => '1024',
   }
 
-  # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
+  # This will create the file '/etc/security/limits.d/80_example2.conf' with the
   # following content:
   #
-  # /etc/security/limits.d/80_slurm.conf
+  # *       hard         nproc        1024
+  # *       hard         nofile       1024
+  #
+  ::ulimit::rule{ 'example2':
+    ensure        => $ensure,
+    ulimit_domain => '*',
+    ulimit_type   => 'hard',
+    ulimit_item   => [ 'nproc', 'nofile' ],
+    ulimit_value  => '1024',
+  }
+
+  # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
+  # following content:
   # [...]
   # *       soft         memlock      unlimited
   # *       soft         stack        unlimited
@@ -27,7 +43,7 @@
   # *       hard         stack        unlimited
   #
   ::ulimit::rule{ 'slurm':
-    ensure        => 'present',
+    ensure        => $ensure,
     ulimit_domain => '*',
     ulimit_type   => [ 'soft', 'hard' ],
     ulimit_item   => [ 'memlock', 'stack' ],
@@ -36,12 +52,12 @@
 
   # Below statement should create '/etc/security/limits.d/50_slurm-nproc.conf'
   # with the following content:
-  #
+  # [...]
   # *       soft         nproc        10240
   # *       hard         nproc        10240
   #
   ::ulimit::rule{ 'slurm-nproc':
-    ensure        => 'present',
+    ensure        => $ensure,
     priority      => 50,
     ulimit_domain => '*',
     ulimit_type   => [ 'soft', 'hard' ],
@@ -51,16 +67,18 @@
 
   # You can also pass the content yourself -- below statement will create
   # '/etc/security/limits.d/60_content.conf' with that content
+  #
   ::ulimit::rule{ 'content':
-    ensure   => 'present',
+    ensure   => $ensure,
     priority => 60,
     content  => template('ulimit/test.erb'),
   }
 
   # ... or pass directly the source file -- below statement will create
   # '/etc/security/limits.d/70_source.conf' with that content
+  #
   ::ulimit::rule{ 'source':
-    ensure   => 'present',
+    ensure   => $ensure,
     priority => 70,
     source   => 'puppet:///modules/ulimit/test.conf',
   }

From 1e94022a22950998ad3d6de1d383e01da467292e Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:02:09 +0200
Subject: [PATCH 23/32] bump to version '1.0.2'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index fe3afcc..89178ae 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his module",
   "license": "Apache License, Version 2.0",

From 20c3f2d7537c145ec1b8d606d577136883bb3088 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:10:44 +0200
Subject: [PATCH 24/32] score improvement

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 Rakefile      | 3 ++-
 metadata.json | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index e889ccd..a3648d9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 ##############################################################################
 # Rakefile - Configuration file for rake (http://rake.rubyforge.org/)
-# Time-stamp: <Lun 2015-03-09 16:53 svarrette>
+# Time-stamp: <Thu 2017-10-05 17:05 svarrette>
 #
 # Copyright (c) 2017  <>
 #                       ____       _         __ _ _
@@ -33,3 +33,4 @@ FalkorLib.config.gitflow do |c|
 end
 
 require 'falkorlib/tasks/git'
+require 'falkorlib/tasks/puppet'
diff --git a/metadata.json b/metadata.json
index 89178ae..3ac4c77 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,8 +2,8 @@
   "name": "svarrette-ulimit",
   "version": "1.0.2",
   "author": "Tom De Vylder, Sebastien Varrette",
-  "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit to allow a version release compliant with Puppet 4 the time Tom release the official new version on his module",
-  "license": "Apache License, Version 2.0",
+  "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit",
+    "license": "Apache-2.0",
   "source": "https://github.com/Falkor/puppet-ulimit",
   "project_page": "http://arioch.github.io/puppet-ulimit/",
   "issues_url": "https://github.com/arioch/puppet-ulimit/issues",
@@ -41,4 +41,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

From 9fc3b22eebea5603fa99fa06d7a4b76534386663 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:11:08 +0200
Subject: [PATCH 25/32] bump to version '1.0.3'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index 3ac4c77..ca7e0de 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,9 +1,9 @@
 {
   "name": "svarrette-ulimit",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit",
-    "license": "Apache-2.0",
+  "license": "Apache-2.0",
   "source": "https://github.com/Falkor/puppet-ulimit",
   "project_page": "http://arioch.github.io/puppet-ulimit/",
   "issues_url": "https://github.com/arioch/puppet-ulimit/issues",
@@ -41,4 +41,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file

From 054b0363e3d811009bef04e12dd76c968c3e7e5e Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:13:23 +0200
Subject: [PATCH 26/32] LICENSE update

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index b58f924..a394872 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-   Copyright (C) 2012 Tom De Vylder
+   Copyright (C) 2012-2017 Tom De Vylder, Sebastien Varrette
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 8372e51e56b4ec00413e5b15174057fc6af9bc18 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:14:21 +0200
Subject: [PATCH 27/32] correct issues links for the metadata

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata.json b/metadata.json
index ca7e0de..d5e8106 100644
--- a/metadata.json
+++ b/metadata.json
@@ -5,8 +5,8 @@
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit",
   "license": "Apache-2.0",
   "source": "https://github.com/Falkor/puppet-ulimit",
-  "project_page": "http://arioch.github.io/puppet-ulimit/",
-  "issues_url": "https://github.com/arioch/puppet-ulimit/issues",
+  "project_page": "https://github.com/Falkor/puppet-ulimit",
+  "issues_url": "https://github.com/Falkor/puppet-ulimit/issues",
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
@@ -41,4 +41,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

From 871f3002e3ffd56e27580edf94d1bd1151a6b9fe Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:16:08 +0200
Subject: [PATCH 28/32] bump to version '1.0.4'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index d5e8106..d51b108 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit",
   "license": "Apache-2.0",
@@ -41,4 +41,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file

From 95211778c7f0274db2d2009c91753b40cb92fb99 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:27:40 +0200
Subject: [PATCH 29/32] cosmetics

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 README.md | 165 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 88 insertions(+), 77 deletions(-)

diff --git a/README.md b/README.md
index fd7f980..dbf30e8 100644
--- a/README.md
+++ b/README.md
@@ -52,84 +52,95 @@ In particular, this module depends on
 
 See also [`tests/rule.pp`](https://github.com/Falkor/puppet-ulimit/blob/master/tests/rule.pp)
 
+---------------
 ```ruby
-  include ::ulimit
-
-  # This will create the file '/etc/security/limits.d/80_example1.conf' with the
-  # following content:
-  #
-  # *       soft         nofile      1024
-  #
-  ::ulimit::rule{ 'example1':
-      ulimit_domain => '*',
-      ulimit_type   => 'soft',
-      ulimit_item   => 'nofile',
-      ulimit_value  => '1024',
-  }
-
-  # This will create the file '/etc/security/limits.d/80_example2.conf' with the
-  # following content:
-  #
-  # *       hard         nproc        1024
-  # *       hard         nofile       1024
-  #
-  ::ulimit::rule{ 'example2':
-    ensure        => 'present,
-    ulimit_domain => '*',
-    ulimit_type   => 'hard',
-    ulimit_item   => [ 'nproc', 'nofile' ],
-    ulimit_value  => '1024',
-  }
-
-  # This will create the file '/etc/security/limits.d/80_slurm.conf' with the
-  # following content:
-  #
-  # [...]
-  # *       soft         memlock      unlimited
-  # *       soft         stack        unlimited
-  # *       hard         memlock      unlimited
-  # *       hard         stack        unlimited
-  #
-  ::ulimit::rule{ 'slurm':
-      ensure        => 'present',
-      ulimit_domain => '*',
-      ulimit_type   => [ 'soft', 'hard' ],
-      ulimit_item   => [ 'memlock', 'stack' ],
-      ulimit_value  => 'unlimited',
-  }
-
-  # Below statement should create '/etc/security/limits.d/50_slurm-nproc.conf'
-  # with the following content:
-  #
-  # *       soft         nproc        10240
-  # *       hard         nproc        10240
-  #
-  ::ulimit::rule{ 'slurm-nproc':
-      ensure        => 'present',
-      priority      => 50,
-      ulimit_domain => '*',
-      ulimit_type   => [ 'soft', 'hard' ],
-      ulimit_item   => 'nproc',
-      ulimit_value  => '10240',
-  }
-
-  # You can also pass the content yourself -- below statement will create
-  # '/etc/security/limits.d/60_content.conf' with that content
-  #
-  ::ulimit::rule{ 'content':
-      ensure   => 'present',
-      priority => 60,
-      content  => template('ulimit/test.erb'),
-  }
-
-  # ... or pass directly the source file -- below statement will create
-  # '/etc/security/limits.d/70_source.conf' with that content
-  #
-  ::ulimit::rule{ 'source':
-      ensure   => 'present',
-      priority => 70,
-      source   => 'puppet:///modules/ulimit/test.conf',
-  }
+include ::ulimit
+
+::ulimit::rule{ 'example1':
+  ulimit_domain => '*',
+  ulimit_type   => 'soft',
+  ulimit_item   => 'nofile',
+  ulimit_value  => '1024',
+}
+```
+
+This will create the file `/etc/security/limits.d/80_example1.conf` with the following content:
+
+      *       soft         nofile      1024
+
+-------------
+```ruby
+include ::ulimit
+
+::ulimit::rule{ 'example2':
+  ulimit_domain => '*',
+  ulimit_type   => 'soft',
+  ulimit_item   => 'nofile',
+  ulimit_value  => '1024',
+}
+```
+
+This will create the file `/etc/security/limits.d/80_example2.conf` with the following content:
+
+        *       hard         nproc        1024
+        *       hard         nofile       1024
+
+---------------
+```ruby
+::ulimit::rule{ 'slurm':
+   ensure        => 'present',
+   ulimit_domain => '*',
+   ulimit_type   => [ 'soft', 'hard' ],
+   ulimit_item   => [ 'memlock', 'stack' ],
+   ulimit_value  => 'unlimited',
+}
+```
+
+ This will create the file `/etc/security/limits.d/80_slurm.conf` with the
+ following content:
+
+       *       soft         memlock      unlimited
+       *       soft         stack        unlimited
+       *       hard         memlock      unlimited
+       *       hard         stack        unlimited
+
+
+----------------
+```ruby
+::ulimit::rule{ 'slurm-nproc':
+   ensure        => 'present',
+   priority      => 50,
+   ulimit_domain => '*',
+   ulimit_type   => [ 'soft', 'hard' ],
+   ulimit_item   => 'nproc',
+   ulimit_value  => '10240',
+}
+```
+
+This statement should create `/etc/security/limits.d/50_slurm-nproc.conf` with the following content:
+
+        *       soft         nproc        10240
+        *       hard         nproc        10240
+
+---------------
+You can also pass the content yourself -- below statement will create  `/etc/security/limits.d/60_content.conf` with that content
+
+```ruby
+::ulimit::rule{ 'content':
+   ensure   => 'present',
+   priority => 60,
+   content  => template('ulimit/test.erb'),
+}
+```
+
+... or pass directly the source file -- below statement will create `/etc/security/limits.d/70_source.conf` with that content:
+
+```ruby
+::ulimit::rule{ 'source':
+   ensure   => 'present',
+   priority => 70,
+   source   => 'puppet:///modules/ulimit/test.conf',
+}
 ```
 
 

From 68193ee008dd7d03f1e3a86e278876d19f901e04 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 17:28:03 +0200
Subject: [PATCH 30/32] bump to version '1.0.5'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index d51b108..f9a0dcf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit",
   "license": "Apache-2.0",

From 63343ce3207a421559d97c252981203ebe891956 Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 18:31:49 +0200
Subject: [PATCH 31/32] support for any type of value for ulimit_value

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 manifests/rule.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/rule.pp b/manifests/rule.pp
index 4595a19..5f70acf 100644
--- a/manifests/rule.pp
+++ b/manifests/rule.pp
@@ -1,5 +1,5 @@
 ################################################################################
-# Time-stamp: <Thu 2017-10-05 16:54 svarrette>
+# Time-stamp: <Thu 2017-10-05 18:26 svarrette>
 #
 # File::      <tt>rule.pp</tt>
 # Author::    Tom De Vylder, Sebastien Varrette
@@ -70,7 +70,7 @@
 #                     - rtprio - max realtime priority
 #                     - chroot - change root to directory (Debian-specific)
 #
-# @param ulimit_value [String]
+# @param ulimit_value [Any]
 #          Value to set for the domain / type
 #
 define ulimit::rule (
@@ -82,7 +82,7 @@
   String  $ulimit_domain = '*',
   $ulimit_type           = undef,
   $ulimit_item           = undef,
-  String  $ulimit_value  = '',
+  $ulimit_value          = undef,
 )
 {
   validate_legacy('String', 'validate_re', $ensure, ['^present', '^absent'])
@@ -91,7 +91,7 @@
   include ::ulimit::config
 
   if ($content == undef and $source == undef and $target == undef) {
-    if ($ulimit_type == undef or $ulimit_item == undef or empty($ulimit_value)) {
+    if ($ulimit_type == undef or $ulimit_item == undef or $ulimit_value == undef) {
       fail("${module_name} requires the definition of type, item and/or value")
     }
     if ! $ulimit_type.is_a(String) and (! $ulimit_type.is_a(Array)) {

From b5e684357d053a8261b043e6e654337ba29d193b Mon Sep 17 00:00:00 2001
From: Sebastien Varrette <Sebastien.Varrette@uni.lu>
Date: Thu, 5 Oct 2017 18:33:18 +0200
Subject: [PATCH 32/32] bump to version '1.0.6'

Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index f9a0dcf..c48c05b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "svarrette-ulimit",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Tom De Vylder, Sebastien Varrette",
   "summary": "Puppet Ulimit module, fork from arioch/puppet-ulimit",
   "license": "Apache-2.0",