Adding mount class

diff --git a/files/etc/auto.removable b/files/etc/auto.removable
new file mode 100644 (file)
index 0000000..5c3dedf
--- /dev/null
+++ b/files/etc/auto.removable
@@ -0,0 +1,6 @@
+usb1    -fstype=auto,sync                       :/dev/sdb1
+usb2    -fstype=auto,sync                       :/dev/sdc1
+usb3    -fstype=auto,sync                       :/dev/sdd1
+usb4    -fstype=auto,sync                       :/dev/sde1
+cdrom  -fstype=iso9660,ro,sync,nodev,nosuid    :/dev/cdrom
+floppy -fstype=auto,sync,nodev,nosuid          :/dev/fd0

diff --git a/manifests/init.pp b/manifests/init.pp
index 083d29cfea780ca82a04aba869370cbc04bf686c..e45e65efcff6d0eb7bdf1f093813b7337e917cbb 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -56,6 +56,7 @@ import "mpd"
 import "bitcoind"
 import "rsync"
 import "runit"
+import "autofs"
 
 # Import subsystems
 import "subsystems/firewire.pp"
@@ -81,6 +82,7 @@ import "subsystems/schroot.pp"
 import "subsystems/resolver.pp"
 import "subsystems/domain.pp"
 import "subsystems/dhclient.pp"
+import "subsystems/mount.pp"
 import "subsystems/utils.pp"
 import "subsystems/utils/debian.pp"
 import "subsystems/utils/desktop.pp"

diff --git a/manifests/subsystems/mount.pp b/manifests/subsystems/mount.pp
new file mode 100644 (file)
index 0000000..7e2f4b6
--- /dev/null
+++ b/manifests/subsystems/mount.pp
@@ -0,0 +1,15 @@
+class mount {
+  class { autofs: }
+
+  file { '/etc/auto.removable':
+    source => [ "puppet:///modules/site-nodo/etc/${::fqdn}/auto.removable",
+                "puppet:///modules/site-nodo/etc/${::domain}/auto.removable",
+                "puppet:///modules/site-nodo/etc/auto.removable",
+                "puppet:///modules/nodo/etc/auto.removable.${::operatingssystem}",
+                "puppet:///modules/nodo/etc/auto.removable" ],
+    notify => Service[autofs],
+    owner  => root,
+    group  => root,
+    mode   => 0644;
+  }
+}