From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 9 Oct 2010 19:58:06 +0000 (-0300)
Subject: Fix uid and gid assignments
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4e12693b5776551c8c10675392bfe582055710fd;p=puppet-user.git

Fix uid and gid assignments
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 120f147..d1458df 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -84,24 +84,23 @@ class user {
       }
 
       if $uid != 'absent' {
-          User[$name]{
-              uid => $uid,
-          }
+        $real_uid = $uid
+      } else {
+        $real_uid = undef
       }
   
       if $gid != 'absent' {
-          if $gid == 'uid' {
-              if $uid != 'absent' {
-                  $real_gid = $uid
-              }
+        if $gid == 'uid' {
+          if $uid != 'absent' {
+            $real_gid = $uid
           } else {
-              $real_gid = $gid
-          }
-          if $real_gid {
-              User[$name]{
-                  gid => $real_gid,
-              }
+            $real_gid = undef
           }
+        } else {
+          $real_gid = $gid
+        }
+      } else {
+        $real_gid = undef
       }
 
       user { "$title":
@@ -114,6 +113,8 @@ class user {
         groups     => $real_groups,
         membership => $membership,
         password   => $password,
+        uid        => $real_uid,
+        gid        => $real_gid,
         tag        => $tag,
       }