Adding virtual regexp for firma

diff --git a/manifests/firma.pp b/manifests/firma.pp
index 3e137e6e4a29d3268f4639a287bc056f0f1d35cd..a858e7fec22ddeb70a09d211d956f8e47a7c3dc6 100644 (file)
--- 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 a6a940b5431fe8836d2f6b874cd04f546cac1085..a15fc5a7d3c592c5992cfa68fa8c2f7ae320a6e4 100644 (file)
--- 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 (file)
index 0000000..9d7f6b9
--- /dev/null
+++ b/templates/postfix/firma/virtual_regexp.erb
@@ -0,0 +1 @@
+/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    $1+request@$2