Using mail module

diff --git a/manifests/init.pp b/manifests/init.pp
index 157b4db3c3d433127f439164b5b0bc823917c764..0e7bae090677c90c1b4c275e4f8a13f8da9f6368 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -39,6 +39,7 @@ import "reprepro"
 import "ssl"
 import "autossh"
 import "nagios"
+import "mail"
 
 # Import subsystems
 import "subsystems/firewall.pp"

diff --git a/manifests/mail.pp b/manifests/mail.pp
index 78a3b7b81d43cfd985203db934fc950e6576dac4..46c2db8a283d03c486c6f69648d544620590ed31 100644 (file)
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -1,74 +1,5 @@
 class nodo::mail {
   # Class for mail nodes
-  $mail_delivery         = "postfix"
-  $postfix_smtp_listen   = "all"
-  $postfix_mydestination = '$myhostname, $mydomain, localhost.$mydomain, localhost'
-
-  case $postfix_mynetworks {
-    '': { $postfix_mynetworks = "127.0.0.0/8" }
-  }
-
   include nodo::vserver
-  include postfix
-  include database
-  include ssl::mail
-
-  # The needed packages
-  package { [ 'postfix-mysql', 'dovecot-imapd', 'maildrop' ]:
-    ensure => installed,
-  }
-
-  package { [ 'libauthen-sasl-cyrus-perl', 'libpam-mysql', 'libsasl2-modules',
-              'libsasl2-modules-sql',      'libgsasl7',    'sasl2-bin' ]:
-    ensure => installed,
-  }
-
-  package { [ 'postgrey', 'amavisd-new', 'spamassassin', 'spamc' ]:
-    ensure => installed,
-  }
-
-  package { [ 'clamav-base', 'clamav-daemon', 'clamav-freshclam' ]:
-    ensure => installed,
-  }
-
-  package { [ 'squirrelmail', 'squirrelmail-secure-login', 'squirrelmail-locales' ]:
-    ensure => installed,
-  } 
-
-  # Postfix configuration
-  postfix::config {
-    "mydomain":           value => "$domain";
-    "myhostname":         value => "$fqdn";
-    "mydestination":      value => $postfix_mydestination;
-    "mynetworks":         value => "$postfix_mynetworks";
-    "relay_domains":      value => "$domain";
-    "virtual_alias_maps": value => "hash:/etc/postfix/virtual";
-    "transport_maps":     value => "hash:/etc/postfix/transport";
-    "mailbox_command":    value => '/usr/bin/maildrop -d ${USER}';
-  }
-
-  postfix::hash { "/etc/postfix/virtual":
-    ensure => present,
-  }
-
-  postfix::hash { "/etc/postfix/transport":
-    ensure => present,
-  }
-
-  # SASL
-  postfix::config { "smtpd_sasl_auth_enable":          value => 'yes' }
-  postfix::config { "smtpd_sasl_local_domain":         value => '$myhostname' }
-  postfix::config { "smtpd_sasl_security_options":     value => 'noanonymous' }
-  postfix::config { "broken_sasl_auth_clients":        value => 'yes' }
-  postfix::config { "smtpd_sasl_authenticated_header": value => 'yes' }
-
-  # Recipient restrictions
-  postfix::config { "smtpd_recipient_restrictions":
-    value => 'permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, reject_rbl_client psbl.surriel.com, check_policy_service inet:127.0.0.1:60000' }
-
-  # TLS
-  postfix::config { "smtpd_tls_cert_file": value => '/etc/ssl/certs/cert.crt' }
-  postfix::config { "smtpd_tls_key_file":  value => '/etc/ssl/private/cert.pem' }
-  postfix::config { "smtpd_use_tls":       value => 'yes' }
-  postfix::config { "smtp_use_tls":        value => 'yes' }
+  include mail
 }