Adding fstab and crypttab classes

diff --git a/manifests/appliance.pp b/manifests/appliance.pp
index 94da45bd38613ba332c9dcd3ae5309bf960db4dd..c8e2cc741d0736d4f2a6311d8094078d791aa682 100644 (file)
--- a/manifests/appliance.pp
+++ b/manifests/appliance.pp
@@ -2,22 +2,12 @@ class nodo::appliance inherits nodo::physical {
   include sysctl::appliance
 
   # fstab
-  file { "/etc/fstab":
-    source  => "puppet://$appliance/modules/nodo/etc/fstab/appliance",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    notify  => Exec['update-initramfs'],
+  class { 'fstab':
+    type => 'appliance',
   }
 
   # crypttab
-  file { "/etc/crypttab":
-    source  => "puppet://$appliance/modules/nodo/etc/crypttab/appliance",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    notify  => Exec['update-initramfs'],
+  class { 'crypttab':
+    type => 'appliance',
   }
 }

diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index 7efbfaf5631f752a24ceed86e58c76972ab6121a..0a58830f6d0db3bd2a988ba97c845c2d233bda20 100644 (file)
--- a/manifests/desktop.pp
+++ b/manifests/desktop.pp
@@ -3,25 +3,15 @@ class nodo::desktop inherits nodo::personal {
 
   # fstab
   if $fstab != false {
-    file { "/etc/fstab":
-      source  => "puppet://$server/modules/nodo/etc/fstab/desktop",
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => present,
-      notify  => Exec['update-initramfs'],
+    class { 'fstab':
+      type => 'desktop',
     }
   }
 
   # crypttab
   if $crypttab != false {
-    file { "/etc/crypttab":
-      source  => "puppet://$server/modules/nodo/etc/crypttab/desktop",
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => present,
-      notify  => Exec['update-initramfs'],
+    class { 'crypttab':
+      type => 'desktop',
     }
   }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 2c08011d6fd38553e0d024e687934f8b3ce10517..f5a3e662d41deea1e0462032375b0556b49330b6 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -85,6 +85,8 @@ import "subsystems/domain.pp"
 import "subsystems/dhclient.pp"
 import "subsystems/mount.pp"
 import "subsystems/monitor.pp"
+import "subsystems/fstab.pp"
+import "subsystems/crypttab.pp"
 import "subsystems/utils.pp"
 import "subsystems/utils/debian.pp"
 import "subsystems/utils/desktop.pp"

diff --git a/manifests/kvm.pp b/manifests/kvm.pp
index 2f4d6320be7bca9cc8518329dec3d8cdda128060..293d753870143b3a7b75b339e09a5823474e8139 100644 (file)
--- a/manifests/kvm.pp
+++ b/manifests/kvm.pp
@@ -1,21 +1,11 @@
 class nodo::kvm inherits nodo::host {
   # fstab
-  file { "/etc/fstab":
-    source  => "puppet://$server/modules/nodo/etc/fstab/kvm",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    notify  => Exec['update-initramfs'],
+  class { 'fstab':
+    type => 'kvm',
   }
 
   # crypttab
-  file { "/etc/crypttab":
-    source  => "puppet://$server/modules/nodo/etc/crypttab/kvm",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    notify  => Exec['update-initramfs'],
+  class { 'crypttab':
+    type => 'kvm',
   }
 }

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index 382279e99f72d807f4323c043f5bcd8b71e61ca6..43303a3107bc78b7413219c374f42da16c5ead3b 100644 (file)
--- 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,
       },

diff --git a/manifests/removable.pp b/manifests/removable.pp
index ee7c369a2baba5957aec4e91d62f25da589d797e..9b0a7235fd73f846b8319657fd0dd8deeb91b845 100644 (file)
--- a/manifests/removable.pp
+++ b/manifests/removable.pp
@@ -1,11 +1,11 @@
 class nodo::removable inherits nodo::desktop {
   # fstab
   File["/etc/fstab"] {
-    source  => "puppet://$server/modules/nodo/etc/fstab/removable",
+    source  => "puppet:///modules/nodo/etc/fstab/removable",
   }
 
   # crypttab
   File["/etc/crypttab"] {
-    source  => "puppet://$server/modules/nodo/etc/crypttab/removable",
+    source  => "puppet:///modules/nodo/etc/crypttab/removable",
   }
 }

diff --git a/manifests/server.pp b/manifests/server.pp
index 2170d53ce45fd889a99ae9b249d29c974664640c..15e52ad91e6fd07c25a40ab224c65230ff4c19d8 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,21 +1,11 @@
 class nodo::server inherits nodo::physical {
   # fstab
-  file { "/etc/fstab":
-    source  => "puppet://$server/modules/nodo/etc/fstab/server",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    notify  => Exec['update-initramfs'],
+  class { 'fstab':
+    type => 'server',
   }
 
   # crypttab
-  file { "/etc/crypttab":
-    source  => "puppet://$server/modules/nodo/etc/crypttab/server",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    notify  => Exec['update-initramfs'],
+  class { 'crypttab':
+    type => 'server',
   }
 }

diff --git a/manifests/subsystems/crypttab.pp b/manifests/subsystems/crypttab.pp
new file mode 100644 (file)
index 0000000..6447005
--- /dev/null
+++ b/manifests/subsystems/crypttab.pp
@@ -0,0 +1,12 @@
+class crypttab(
+  $type
+) {
+  file { "/etc/crypttab":
+    source  => "puppet:///modules/nodo/etc/crypttab/${type}",
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+    notify  => Exec['update-initramfs'],
+  }
+}

diff --git a/manifests/subsystems/fstab.pp b/manifests/subsystems/fstab.pp
new file mode 100644 (file)
index 0000000..40c8c30
--- /dev/null
+++ b/manifests/subsystems/fstab.pp
@@ -0,0 +1,12 @@
+class fstab(
+  $type
+) {
+  file { "/etc/fstab":
+    source  => "puppet:///modules/nodo/etc/fstab/${type}",
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+    notify  => Exec['update-initramfs'],
+  }
+}