Do not use exim for mail hosts

diff --git a/manifests/mail.pp b/manifests/mail.pp
index 2f4b0ed04b292d128ac6b7bc3eea714d4cdef188..be544c068df621dde8c8ee17913710c4bc759573 100644 (file)
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -1,8 +1,19 @@
-class nodo::mail inherits nodo::vserver {
+class nodo::mail {
   # Class for mail nodes
+  $mail_host             = true
   $postfix_relayhost     = "$domain"
   $postfix_smtp_listen   = "$ip"
   $postfix_mydestination = "\$myorigin"
 
+  include nodo::vserver
   include postfix::mta
+  include database
+
+  package { 'postfix-mysql':
+    ensure => installed,
+  }
+
+  package { [ 'squirrelmail', 'squirrelmail-secure-login', ' squirrelmail-locales' ]:
+    ensure => installed,
+  }
 }

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index b0f2c8291ce0f6f1c60b854e19c61f2a4baa648d..8b2b5e5d6588608e624f3674b74d58285ce501ff 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -2,7 +2,6 @@ class nodo {
   include lsb
   include puppetd
   include backup
-  include exim
   include sudo
   include users::admin
   include motd
@@ -29,6 +28,11 @@ class nodo {
   $monkeysphere_publish_key = false
   include monkeysphere
 
+  # Email delivery configuration
+  if $mail_host != true {
+    include exim
+  }
+
   # Apt configuration
   $backports_enabled = true
   $apt_update_method = 'cron'