Adding mail::mlmmj::list

diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index 52b9bd01fc4459b17ce5776567cdfc6c33ad055c..a8fc9ff0f3399e87b88ba96c2e35f4783ca92fb7 100644 (file)
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -30,10 +30,17 @@ class mail::mlmmj {
   #}
 
   postfix::transport_regexp_snippet { 'mlmmj_transport_regexp':
-    content => template('mail/postfix/mlmmj/transport_regexp.erb'),
+    content => '',
   }
 
   postfix::virtual_regexp_snippet { 'mlmmj_virtual_regexp':
     content => template('mail/postfix/mlmmj/virtual_regexp.erb'),
   }
+
+  define list($ensure = 'present') {
+    postfix::transport_regexp_snippet { "mlmmj_transport_regexp-$name":
+      content => "/^($name).*$/             mlmmj:$name",
+      ensure  => $ensure,
+    }
+  }
 }

diff --git a/templates/postfix/mlmmj/transport_regexp.erb b/templates/postfix/mlmmj/transport_regexp.erb
index ff6cf1235625d99d2b32b2b0efe52e48c3bcff90..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/templates/postfix/mlmmj/transport_regexp.erb
+++ b/templates/postfix/mlmmj/transport_regexp.erb
@@ -1 +0,0 @@
-/^(.*)\@<%= mlmmj_subdomain.gsub(/\./, '\.') %>\.(.*)$/       mlmmj:${1}

diff --git a/templates/postfix/mlmmj/virtual_regexp.erb b/templates/postfix/mlmmj/virtual_regexp.erb
index a500819e222b6360372c96dd13ef74f32ca855f2..77811ddf8072744dc5d3f321ab36893e18a1d756 100644 (file)
--- a/templates/postfix/mlmmj/virtual_regexp.erb
+++ b/templates/postfix/mlmmj/virtual_regexp.erb
@@ -1 +1 @@
-/^(.*)\@<%= mlmmj_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    $1@$2
+/^(.*)\@<%= mlmmj_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    ${1}