From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 11 Apr 2012 23:39:40 +0000 (-0300)
Subject: Adding virtual regexp for firma
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f5b8ec2d957259a0c8e9213d4cdea26be4c3d498;p=puppet-mail.git

Adding virtual regexp for firma
---

diff --git a/manifests/firma.pp b/manifests/firma.pp
index 3e137e6..a858e7f 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -8,6 +8,10 @@ class mail::firma {
     content => template('mail/postfix/firma/transport_regexp.erb'),
   }
 
+  postfix::virtual_regexp_snippet { 'firma_virtual_regexp':
+    content => template('mail/postfix/firma/virtual_regexp.erb'),
+  }
+
   postfix::transport { "${firma_subdomain}.$domain":
     ensure      => absent,
     destination => "firma",
diff --git a/templates/postfix/firma/transport_regexp.erb b/templates/postfix/firma/transport_regexp.erb
index a6a940b..a15fc5a 100644
--- a/templates/postfix/firma/transport_regexp.erb
+++ b/templates/postfix/firma/transport_regexp.erb
@@ -1,2 +1,2 @@
-/^.*-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest:
+/^.*+request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest:
 /^.*\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/       firma:
diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb
new file mode 100644
index 0000000..9d7f6b9
--- /dev/null
+++ b/templates/postfix/firma/virtual_regexp.erb
@@ -0,0 +1 @@
+/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    $1+request@$2