aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-10 14:37:17 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-10 14:37:17 -0200
commit3103dc7f9b246735b385d46d9121dbb7895a02c2 (patch)
tree50862ae8f9ff9a9901e943344c92f487bf148808
parentf7c2409de25b3f40836880ed28940c4d4caddeb3 (diff)
downloadpuppet-nodo-3103dc7f9b246735b385d46d9121dbb7895a02c2.tar.gz
puppet-nodo-3103dc7f9b246735b385d46d9121dbb7895a02c2.tar.bz2
Adding custom fstab for vservers
-rw-r--r--files/etc/fstab-vserver2
-rw-r--r--manifests/init.pp15
2 files changed, 15 insertions, 2 deletions
diff --git a/files/etc/fstab-vserver b/files/etc/fstab-vserver
new file mode 100644
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 cde0182..aa9f125 100644
--- 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
}