summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-04-26 10:09:21 +0200
committervarac <varacanero@zeromail.org>2013-07-09 14:16:59 +0200
commitadc12547c53639fe9cf97157d05e2b401dc7c9c3 (patch)
tree47a2d6bafb4ae76ccf38a64632c6d014a74458d9 /puppet
parentf242bcefaeae008083c0281f3103b67d31264e4f (diff)
using alias resolver
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_postfix/manifests/mx.pp27
1 files changed, 7 insertions, 20 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 2bf844bf..82536b80 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -11,28 +11,15 @@ class site_postfix::mx {
'mydestination':
value => "\$myorigin, localhost, localhost.\$mydomain, ${domain}";
'smtpd_recipient_restrictions':
- value => 'check_recipient_access hash:/etc/postfix/recipient,reject_unauth_destination';
- 'mailbox_size_limit':
- value => '0';
- 'home_mailbox':
- value => 'Maildir/';
- 'virtual_alias_maps':
- value => 'hash:/etc/postfix/virtual';
+ value => 'check_recipient_access tcp:localhost:2244,reject_unauth_destination';
+ 'mailbox_size_limit': value => '0';
+ 'home_mailbox': value => 'Maildir/';
+ 'virtual_alias_maps': value => 'tcp:localhost:4242';
+ 'luser_relay': value => 'vmail';
+ 'local_recipient_maps': value => '';
}
- postfix::hash { '/etc/postfix/virtual': }
- postfix::hash { '/etc/postfix/recipient': }
-
- # for now, accept all mail
- line {'deliver to vmail':
- file => '/etc/postfix/recipient',
- line => "@${domain} vmail",
- notify => Exec['generate /etc/postfix/recipient.db'],
- require => Package['postfix'],
- }
-
- postfix::virtual { "@${domain}": destination => 'vmail'; }
- #postfix::mailalias { 'vmail': recipient => 'vmail' }
+ #include site_postfix::mx::smtp_checks
user { 'vmail':
ensure => present,