Adding custom fstab for vservers

diff --git a/files/etc/fstab-vserver b/files/etc/fstab-vserver
new file mode 100644 (file)
index 0000000..8b82d56
--- /dev/null
+++ b/files/etc/fstab-vserver
@@ -0,0 +1,2 @@
+none    /proc           proc    defaults                0 0
+none    /dev/pts        devpts  gid=5,mode=620          0 0

diff --git a/manifests/init.pp b/manifests/init.pp
index cde01821ffa87eb5306f9fb28c5aef0e4c38f2c7..aa9f125170e9dffdec606da48c717877a0bb466e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -159,8 +159,6 @@ class nodo::vserver inherits nodo {
       $id = $context
     }
 
-    # TODO: some nodes need a lot of space at /tmp otherwise some admin
-    # tasks like backups might not run.
     vserver { $name:
       ensure    => $ensure,
       context   => "$context",
@@ -170,6 +168,18 @@ class nodo::vserver inherits nodo {
       hostname  => "$name.$domain",
     }
 
+    # Some nodes need a lot of space at /tmp otherwise some admin
+    # tasks like backups might not run.
+    file { "/etc/vservers/${name}/fstab":
+      source  => "puppet://$server/modules/nodo/etc/fstab-vserver",
+      owner   => "root",
+      group   => "root",
+      mode    => 0644,
+      ensure  => present,
+      notify  => Exec["vs_restart_${name}"],
+      require => Vserver["$name"];
+    }
+
     # Create a munin virtual resource to be realized in the node
     #@nodo::vserver::munin {
     #  type => $munin,
@@ -299,5 +309,6 @@ class nodo::web inherits nodo::vserver {
 }
 
 class nodo::proxy inherits nodo::vserver {
+  # TODO: openssl?
   include nginx
 }