Fixing mlmmj transport and virtual rules

diff --git a/manifests/mlmmj/domain.pp b/manifests/mlmmj/domain.pp
index c58b179b27f8aaf10333ec2332d8b81cadbaebb3..939036a5c717cbf87b3786e03b4decda05f778a2 100644 (file)
--- 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 9de5c06897aaea7cca087f2a85dabcc2f099fca9..24e5e227819b8a059a2af21dccfc474aa3b1e3f1 100644 (file)
--- 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,
   }
 }