also install conf for root

3 files changed, 45 insertions, 31 deletions

diff --git a/modules/conf/manifests/init.pp b/modules/conf/manifests/init.pp
new file mode 100644
index 0000000..9dff5f9
--- /dev/null
+++ b/modules/conf/manifests/init.pp
@@ -0,0 +1,40 @@
+class conf {
+  $user = $name
+  $home = $user ? {
+    'root' => '/root',
+    default => "/home/$user",
+  }
+
+  exec { "git clone doy/conf for $user":
+    command => "/usr/bin/git clone git://github.com/doy/conf",
+    user => $user,
+    cwd => $home,
+    creates => "$home/conf",
+    require => [
+      User[$user],
+      Package["git"],
+    ];
+  }
+
+  exec { "conf make install for $user":
+    command => "/usr/bin/make install",
+    user => $user,
+    cwd => "$home/conf",
+    environment => [
+      "HOME=$home",
+      "PWD=$home/conf",
+    ],
+    creates => "$home/.vimrc",
+    require => [
+      User[$user],
+      Exec["git clone doy/conf for $user"],
+      Package["vim"],
+      Package["make"],
+      Package["git"],
+      Package["cronie"],
+      Package["fortune-mod"],
+      Package["less"],
+      Package["gcc"],
+    ],
+  }
+}
diff --git a/modules/doy/manifests/conf.pp b/modules/doy/manifests/conf.pp
index 57b4831..3906b94 100644
--- a/modules/doy/manifests/conf.pp
+++ b/modules/doy/manifests/conf.pp
@@ -1,34 +1,4 @@
 class doy::conf {
-  exec { "git clone doy/conf":
-    command => "/usr/bin/git clone git://github.com/doy/conf",
-    user => "doy",
-    cwd => "/home/doy",
-    creates => "/home/doy/conf",
-    require => [
-      User["doy"],
-      Package["git"],
-    ];
-  }
-
-  exec { "conf make install":
-    command => "/usr/bin/make install",
-    user => "doy",
-    cwd => "/home/doy/conf",
-    environment => [
-      'HOME=/home/doy',
-      'PWD=/home/doy/conf',
-    ],
-    creates => "/home/doy/.vimrc",
-    require => [
-      User["doy"],
-      Exec["git clone doy/conf"],
-      Package["vim"],
-      Package["make"],
-      Package["git"],
-      Package["cronie"],
-      Package["fortune-mod"],
-      Package["less"],
-      Package["gcc"],
-    ],
+  conf { "doy":
   }
 }
diff --git a/modules/root/manifests/conf.pp b/modules/root/manifests/conf.pp
new file mode 100644
index 0000000..2bcc214
--- /dev/null
+++ b/modules/root/manifests/conf.pp
@@ -0,0 +1,4 @@
+class root::conf {
+  conf { 'root':
+  }
+}