1 files changed, 4 insertions, 14 deletions
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 2383ada..87a928b 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,29 +1,19 @@
 class nodo::role::mail {
   class { [ 'nodo::role::virtual', 'mail::system' ]: }
 
-  # Config parameters
-  $delivery = hiera('nodo::subsystem::mail::delivery', 'exim')
-  $virtual  = hiera('mail::virtual', false)
-
   # Graph postfix
   munin::plugin { [ 'postfix_mailqueue', 'postfix_mailstats' ]:
     config => 'user root',
-    ensure => $delivery ? {
-      'postfix' => present,
-       default  => absent,
-    },
+    ensure => present,
   }
 
-  # Graph mysql
-  package { 'libcache-cache-perl':  # needed by munin mysql plugin
+  # Graph mysql, needed by munin mysql plugin
+  package { 'libcache-cache-perl':
     ensure => present,
   }
 
   munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
     config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf",
-    ensure => $virtual ? {
-       true     => present,
-       default  => absent,
-    },
+    ensure => present,
   }
 }