Simplify selectors

diff --git a/manifests/manage.pp b/manifests/manage.pp
index 46ba4d2e39fcdf25fa53630fbf5c1aee86e303ab..becd2e2bee57a1d18d8883a43950c116e591f066 100644 (file)
--- a/manifests/manage.pp
+++ b/manifests/manage.pp
@@ -65,19 +65,12 @@ define user::manage(
         ensure  => directory,
         require => User[$name],
         owner   => $name,
-        mode    => $homedir_mode;
-      }
-      case $gid {
-        'absent','uid': {
-          File[$real_homedir]{
-            group => $name,
-          }
-        }
-        default: {
-          File[$real_homedir]{
-            group => $gid,
-          }
-        }
+        mode    => $homedir_mode,
+        group   => $gid ? {
+          'uid'     => $name,
+          'absent'  => $name,
+          'default' => $gid,
+        },
       }
     }
   } else {
@@ -90,19 +83,11 @@ define user::manage(
           owner   => $name,
           mode    => $homedir_mode,
           require => User[$name],
-        }
-      }
-
-      case $gid {
-        'absent','uid': {
-          File[$managehome] {
-            group => $name,
-          }
-        }
-        default: {
-          File[$managehome] {
-            group => $gid,
-          }
+          group   => $gid ? {
+            'uid'     => $name,
+            'absent'  => $name,
+            'default' => $gid,
+          },
         }
       }