summaryrefslogtreecommitdiff
path: root/manifests/mlmmj
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-27 19:20:25 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-27 19:20:25 -0300
commit0fb31b3950feee65511f029b2626b5bc816d1f10 (patch)
tree7e9662452207ba3551cb137da24f3cdd23a50598 /manifests/mlmmj
parent7df45a71a00b9cd5441e30abddcbbc0ed8f66485 (diff)
downloadpuppet-mail-0fb31b3950feee65511f029b2626b5bc816d1f10.tar.gz
puppet-mail-0fb31b3950feee65511f029b2626b5bc816d1f10.tar.bz2
Fixing mlmmj transport and virtual rules
Diffstat (limited to 'manifests/mlmmj')
-rw-r--r--manifests/mlmmj/domain.pp2
-rw-r--r--manifests/mlmmj/list.pp4
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,
}
}