From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 11 Apr 2012 23:52:24 +0000 (-0300)
Subject: Fixing firma and sympa virtual regexps
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=95bb0df356b27ac9eebd2dab7c12ea34281eb814;p=puppet-mail.git

Fixing firma and sympa virtual regexps
---

diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb
index 9d7f6b9..f938a3f 100644
--- a/templates/postfix/firma/virtual_regexp.erb
+++ b/templates/postfix/firma/virtual_regexp.erb
@@ -1 +1 @@
-/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    $1+request@$2
+/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/     $1+request@<%= firma_subdomain %>$2
diff --git a/templates/postfix/sympa/virtual_regexp.erb b/templates/postfix/sympa/virtual_regexp.erb
index b1c1245..a2ab261 100644
--- a/templates/postfix/sympa/virtual_regexp.erb
+++ b/templates/postfix/sympa/virtual_regexp.erb
@@ -1 +1 @@
-/^(.*)-owner\@<%= sympa_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    $1+owner@$2
+/^(.*)-owner\@<%= sympa_subdomain.gsub(/\./, '\.') %>\.(.*)$/    $1+owner@<%= sympa_subdomain %>.$2