Fixing firma and sympa virtual regexps

diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb
index 9d7f6b980fc72dc2c303a53111452be12f06e82f..f938a3f0ac9235ec36d0f649b791b8611d83fd59 100644 (file)
--- 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 b1c1245e1b01a75b49a9da7eeb85202c0f029f7e..a2ab261e3311f66bf166b6ece5a121718c162fef 100644 (file)
--- 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