Moving some stuff at host and personal classes

diff --git a/manifests/host.pp b/manifests/host.pp
index a38ed5338ecb2b37c939560caf378a62aeb09e95..5682aea99f5de59c928b27314c377ce53d9f59f1 100644 (file)
--- 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 {

diff --git a/manifests/personal.pp b/manifests/personal.pp
index ca5370b1cc28bfba1bdc43ad0e2b1300633ecd7e..f1786e1d8486d813c408242982cb235c082fcc74 100644 (file)
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -16,6 +16,12 @@ class nodo::personal {
     use_nagios => hiera('nodo::personal::use_nagios', false),
   }
 
+  # Removable media folder
+  file { [ "/media/usb", "/media/cdrom", "/media/tablet", "/media/phone" ]:
+    ensure => directory,
+    mode   => 0755,
+  }
+
   # Misc user data
   file { "/var/data":
     ensure => directory,

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 5f9ffb658d7a2bf87cea6e2d529dc3778898bdfa..887eb8d52e58dfaf72eec039ab66fa189f64de53 100644 (file)
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -12,12 +12,6 @@ class nodo::physical inherits nodo::host {
     }
   }
 
-  # Removable media folder
-  file { [ "/media/usb", "/media/cdrom", "/media/tablet", "/media/phone" ]:
-    ensure => directory,
-    mode   => 0755,
-  }
-
   # Entropy key
   $ekey_masterkey = hiera('nodo::physical::ekey_masterkey', '')
   if $ekey_masterkey != '' {