diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-04-24 16:11:42 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-04-24 16:11:42 -0300 |
| commit | d49fc4e4fe00fa76d296522a0951022d327b088b (patch) | |
| tree | 854eed076b0a5c52179f777ce58013db546f02c8 | |
| parent | db0a70a51ab316e5f4af92e0f92371ad366c64b6 (diff) | |
| download | puppet-nodo-d49fc4e4fe00fa76d296522a0951022d327b088b.tar.gz puppet-nodo-d49fc4e4fe00fa76d296522a0951022d327b088b.tar.bz2 | |
Do not use exim for mail hosts
| -rw-r--r-- | manifests/mail.pp | 13 | ||||
| -rw-r--r-- | manifests/nodo.pp | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/manifests/mail.pp b/manifests/mail.pp index 2f4b0ed..be544c0 100644 --- 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 b0f2c82..8b2b5e5 100644 --- 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' |