Merge branch 'release/0.8.4' into production

Gemfile.lock

@@ -1,19 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     artii (2.1.2)
-    awesome_print (1.7.0)
+    awesome_print (1.8.0)
     configatron (3.2.0)
     deep_merge (1.0.1)
     diff-lcs (1.2.5)
     diffy (3.2.0)
     facter (2.4.6)
-    falkorlib (0.7.7)
+    falkorlib (0.7.8)
       activesupport (~> 4.0)
       artii (>= 2.1)
       awesome_print (~> 1.2)
@@ -33,14 +33,14 @@ GEM
     git_remote_branch (0.3.8)
     hiera (2.0.0)
       json_pure
-    i18n (0.8.1)
+    i18n (0.8.6)
     json (1.8.6)
     json_pure (1.8.2)
     license-generator (0.4.1)
       thor
     logger (1.2.8)
     minigit (0.0.4)
-    minitest (5.10.2)
+    minitest (5.10.3)
     puppet (4.0.0)
       facter (> 2.0, < 4)
       hiera (>= 2.0, < 3)
@@ -66,10 +66,11 @@ GEM
     rspec-support (3.2.2)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.4)
-    thor-zsh_completion (0.1.2)
+    thor (0.20.0)
+    thor-zsh_completion (0.1.4)
+      thor (~> 0)
     thread_safe (0.3.6)
-    tins (1.13.3)
+    tins (1.15.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
 

manifests/common.pp

@@ -111,7 +111,7 @@
 
     # Add the sysadmin to the sudoers file
     include sudo
-    sudo::directive { "${sysadmins::login}":
+    sudo::directive { $::sysadmins::login:
         content => "${sysadmins::login}    ALL=(ALL)   NOPASSWD:ALL\n",
     }
 
@@ -135,7 +135,12 @@
     }
 
     # Create an entry for ${sysadmins::login} in /etc/aliases
-    $mail_list = parseyaml(inline_template('<%= scope.lookupvar("sysadmins::users").collect { |k,v| v["email"] unless v["email"].nil? }.to_yaml %>'))
+    if($sysadmins::email != ''){
+      $mail_list = $sysadmins::email
+    }
+    else{
+      $mail_list = parseyaml(inline_template('<%= scope.lookupvar("sysadmins::users").collect { |k,v| v["email"] unless v["email"].nil? }.to_yaml %>'))
+    }
 
     mailalias { $::sysadmins::login:
         ensure    => $::sysadmins::ensure,

manifests/params.pp

@@ -35,6 +35,7 @@
     $login = 'localadmin'
 
     # redirect all mails sent to the sysadmin account to this email address
+    # if no email is defined ('' string) will send email individually to all admins
     $email = ''
 
     # whether to purge the authorized_keys files or not

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "ULHPC/sysadmins",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "author": "UL HPC DevOps Team aka. S. Varrette, H. Cartiaux, V. Plugaru, S. Diehl and C.Parisot",
   "mail": "hpc-sysadmins@uni.lu",
   "summary": "Configuration of a single system administrator account (localadmin by default) attached to (potentially) several  users",