Moving some stuff at host and personal classes

1 files changed, 15 insertions, 12 deletions

diff --git a/manifests/host.pp b/manifests/host.pp
index a38ed53..5682aea 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -10,33 +10,36 @@ class nodo::host inherits nodo {
 
   monkeysphere_host { "${::hostname}": }
 
-  # Firewall configuration
+  # Firewall
   class { 'firewall': }
 
-  # Vserver configuration
-  class { 'vserver::host':
-    vdirbase => "/var/vservers",
-  }
-
-  # Monitoring
-  if !defined('monitor') {
-    class { 'monitor':
-      type       => 'host',
-      use_nagios => hiera('nodo::host::use_nagios', True),
+  # Vserver
+  if $::lsbdistcodename == 'squeeze' {
+    class { 'vserver::host':
+      vdirbase => "/var/vservers",
     }
   }
 
-  # Time configuration
+  # Time
   $ntpdate = hiera('nodo::host::ntpdate', True)
   case $ntpdate {
     false:   { class { 'timezone': } }
     default: { class { 'ntpdate':  } }
   }
 
+  # Backup
   backupninja::sys { "sys":
     ensure => present,
   }
 
+  # Monitoring
+  if !defined('monitor') {
+    class { 'monitor':
+      type       => 'host',
+      use_nagios => hiera('nodo::host::use_nagios', True),
+    }
+  }
+
   # Munin configuration
   $munin = hiera('nodo::host::use_munin', True)
   if $munin == true {