Ensure we have full domains on mlmmj regexps

diff --git a/manifests/mlmmj/list.pp b/manifests/mlmmj/list.pp
index 13f30a9df2bac697132ffa167a58a636a574a862..9de5c06897aaea7cca087f2a85dabcc2f099fca9 100644 (file)
--- a/manifests/mlmmj/list.pp
+++ b/manifests/mlmmj/list.pp
@@ -6,14 +6,20 @@
 #   version 2.3 and later).
 #
 # That's why we need one definition per mailing list.
-define mail::mlmmj::list($ensure = 'present') {
+define mail::mlmmj::list(
+  $ensure    = 'present',
+  $subdomain = hiera('mail::mlmmj::subdomain', $mail::mlmmj::params::subdomain),
+  $tld       = $::domain
+) {
+  $fulldomain = regsubst("${subdomain}.${tld}", '\.', '\.', 'G')
+
   postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}":
-    content => "/^(${name})\\@.*$/    mlmmj:${name}\n",
+    content => "/^(${name})\\@${fulldomain}$/    mlmmj:${name}\n",
     ensure  => $ensure,
   }
 
   postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}-request":
-    content => "/^(${name})\\+.*\\@.*$/    mlmmj:${name}\n",
+    content => "/^(${name})\\+.*\\@${fulldomain}$/    mlmmj:${name}\n",
     ensure  => $ensure,
   }
 }