diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-27 19:20:25 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-27 19:20:25 -0300 |
| commit | 0fb31b3950feee65511f029b2626b5bc816d1f10 (patch) | |
| tree | 7e9662452207ba3551cb137da24f3cdd23a50598 | |
| parent | 7df45a71a00b9cd5441e30abddcbbc0ed8f66485 (diff) | |
| download | puppet-mail-0fb31b3950feee65511f029b2626b5bc816d1f10.tar.gz puppet-mail-0fb31b3950feee65511f029b2626b5bc816d1f10.tar.bz2 | |
Fixing mlmmj transport and virtual rules
| -rw-r--r-- | manifests/mlmmj/domain.pp | 2 | ||||
| -rw-r--r-- | manifests/mlmmj/list.pp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/manifests/mlmmj/domain.pp b/manifests/mlmmj/domain.pp index c58b179..939036a 100644 --- a/manifests/mlmmj/domain.pp +++ b/manifests/mlmmj/domain.pp @@ -5,7 +5,9 @@ define mail::mlmmj::domain() { # content => template('mail/mlmmj/transport_regexp.erb'), #} + # TODO: This is not needed anymore as everything ins handled by mail::mlmmj::list postfix::virtual_regexp_snippet { "mlmmj_virtual_regexp-${name}": + ensure => absent, content => template('mail/mlmmj/virtual_regexp.erb'), } } diff --git a/manifests/mlmmj/list.pp b/manifests/mlmmj/list.pp index 9de5c06..24e5e22 100644 --- a/manifests/mlmmj/list.pp +++ b/manifests/mlmmj/list.pp @@ -14,12 +14,12 @@ define mail::mlmmj::list( $fulldomain = regsubst("${subdomain}.${tld}", '\.', '\.', 'G') postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}": - content => "/^(${name})\\@${fulldomain}$/ mlmmj:${name}\n", + content => "/^${name}\\@${fulldomain}$/ mlmmj:${name}\n", ensure => $ensure, } postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}-request": - content => "/^(${name})\\+.*\\@${fulldomain}$/ mlmmj:${name}\n", + content => "/^${name}\\+.*\\@${fulldomain}$/ mlmmj:${name}\n", ensure => $ensure, } } |