more refactoring

1 files changed, 14 insertions, 12 deletions

diff --git a/modules/conf/manifests/init.pp b/modules/conf/manifests/init.pp
index 30159a2..a14c560 100644
--- a/modules/conf/manifests/init.pp
+++ b/modules/conf/manifests/init.pp
@@ -1,15 +1,17 @@
-define conf {
-  $user = $name
-  $home = $user ? {
-    'root' => '/root',
-    default => "/home/$user",
+define conf($user=$name, $home=undef) {
+  $_home = $home ? {
+    undef => $user ? {
+      'root' => '/root',
+      default => "/home/$user",
+    },
+    default => $home,
   }
 
   exec { "git clone doy/conf for $user":
     command => "/usr/bin/git clone git://github.com/doy/conf",
     user => $user,
-    cwd => $home,
-    creates => "$home/conf",
+    cwd => $_home,
+    creates => "$_home/conf",
     require => [
       User[$user],
       Package["git"],
@@ -19,12 +21,12 @@ define conf {
   exec { "conf make install for $user":
     command => "/usr/bin/make install",
     user => $user,
-    cwd => "$home/conf",
+    cwd => "$_home/conf",
     environment => [
-      "HOME=$home",
-      "PWD=$home/conf",
+      "HOME=$_home",
+      "PWD=$_home/conf",
     ],
-    creates => "$home/.vimrc",
+    creates => "$_home/.vimrc",
     require => [
       User[$user],
       Exec["git clone doy/conf for $user"],
@@ -35,6 +37,6 @@ define conf {
       Package["fortune-mod"],
       Package["less"],
       Package["gcc"],
-    ],
+    ];
   }
 }