aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-12-15 20:27:06 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-12-15 20:27:06 -0200
commit75f4578be31ef69f54b2a1ec1003506f3e49ddae (patch)
tree9d0b6b84a07a48e2fea969b0cc06f50feeb32c69
parentcece72d726043ebe43d83f9bf56cf52f7cd02148 (diff)
downloadpuppet-nodo-75f4578be31ef69f54b2a1ec1003506f3e49ddae.tar.gz
puppet-nodo-75f4578be31ef69f54b2a1ec1003506f3e49ddae.tar.bz2
Adding mount class
-rw-r--r--files/etc/auto.removable6
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/subsystems/mount.pp15
3 files changed, 23 insertions, 0 deletions
diff --git a/files/etc/auto.removable b/files/etc/auto.removable
new file mode 100644
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 083d29c..e45e65e 100644
--- 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
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;
+ }
+}