summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-04-11 20:52:24 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-04-11 20:52:24 -0300
commit95bb0df356b27ac9eebd2dab7c12ea34281eb814 (patch)
tree60109084a49faa464960d97528d912472015b81a /templates
parentf5b8ec2d957259a0c8e9213d4cdea26be4c3d498 (diff)
downloadpuppet-mail-95bb0df356b27ac9eebd2dab7c12ea34281eb814.tar.gz
puppet-mail-95bb0df356b27ac9eebd2dab7c12ea34281eb814.tar.bz2
Fixing firma and sympa virtual regexps
Diffstat (limited to 'templates')
-rw-r--r--templates/postfix/firma/virtual_regexp.erb2
-rw-r--r--templates/postfix/sympa/virtual_regexp.erb2
2 files changed, 2 insertions, 2 deletions
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