Adding fstab and crypttab classes

1 files changed, 15 insertions, 24 deletions

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index 382279e..43303a3 100644
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -9,38 +9,29 @@ class nodo::laptop inherits nodo::personal {
 
   # fstab
   if $fstab != false {
-    file { "/etc/fstab":
-      source => "puppet://$server/modules/nodo/etc/fstab/laptop",
-      owner  => "root",
-      group  => "root",
-      mode   => 0644,
-      ensure => present,
-      notify => Exec['update-initramfs'],
+    class { 'fstab':
+      type => 'laptop',
     }
   }
 
   # crypttab
   if $crypttab != false {
-    file { "/etc/crypttab":
-      source    => $hibernate ? {
-        false   => "puppet://$server/modules/nodo/etc/crypttab/laptop",
-        default => "puppet://$server/modules/nodo/etc/crypttab/laptop.hibernate",
+    class { 'crypttab':
+      type => $hibernate ? {
+        false   => "laptop",
+        default => "laptop.hibernate",
       },
-      owner     => "root",
-      group     => "root",
-      mode      => 0644,
-      ensure    => present,
-      notify    => Exec['update-initramfs'],
     }
+  }
 
-    # hibernation
-    file { "/etc/initramfs-tools/conf.d/resume":
-      owner     => "root",
-      group     => "root",
-      mode      => 0644,
-      content   => "RESUME=/dev/mapper/cswap\n",
-      notify    => Exec['update-initramfs'],
-      ensure    => $hibernate ? {
+  # hibernation
+  file { "/etc/initramfs-tools/conf.d/resume":
+    owner     => "root",
+    group     => "root",
+    mode      => 0644,
+    content   => "RESUME=/dev/mapper/cswap\n",
+    notify    => Exec['update-initramfs'],
+    ensure    => $hibernate ? {
         false   => absent,
         default => present,
       },