diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-27 16:47:54 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-27 16:47:54 -0300 |
| commit | f9f925230cee5c41f77357b7b1c8925e4a0caf7c (patch) | |
| tree | 9232c96296e191905e494b99eeb378b2dd5b7503 /templates | |
| parent | ba0c856f111abcb0120a5b77ecf3b137d0152100 (diff) | |
| download | puppet-mail-f9f925230cee5c41f77357b7b1c8925e4a0caf7c.tar.gz puppet-mail-f9f925230cee5c41f77357b7b1c8925e4a0caf7c.tar.bz2 | |
Be more explicit on virtual and transport regexps and allow more virtual domains to be defined
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/firma/transport_regexp.erb | 4 | ||||
| -rw-r--r-- | templates/firma/virtual_regexp.erb | 2 | ||||
| -rw-r--r-- | templates/mlmmj/virtual_regexp.erb | 2 | ||||
| -rw-r--r-- | templates/sympa/transport_regexp.erb | 4 | ||||
| -rw-r--r-- | templates/sympa/virtual_regexp.erb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/templates/firma/transport_regexp.erb b/templates/firma/transport_regexp.erb index 27c65af..fb715f5 100644 --- a/templates/firma/transport_regexp.erb +++ b/templates/firma/transport_regexp.erb @@ -1,2 +1,2 @@ -/^.*+request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest: -/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firma: +/^.*+request\@<%= subdomain.gsub(/\./, '\.') %>$/ firmarequest: +/^.*\@<%= subdomain.gsub(/\./, '\.') %>$/ firma: diff --git a/templates/firma/virtual_regexp.erb b/templates/firma/virtual_regexp.erb index 767f3c1..310cacd 100644 --- a/templates/firma/virtual_regexp.erb +++ b/templates/firma/virtual_regexp.erb @@ -1 +1 @@ -/^(.*)-request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+request@<%= subdomain %>.$2 +/^(.*)-request\@<%= subdomain.gsub(/\./, '\.') %>$/ $1+request@<%= subdomain %> diff --git a/templates/mlmmj/virtual_regexp.erb b/templates/mlmmj/virtual_regexp.erb index 57f1a72..e93ebcd 100644 --- a/templates/mlmmj/virtual_regexp.erb +++ b/templates/mlmmj/virtual_regexp.erb @@ -1 +1 @@ -/^(.*)\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ ${1} +/^(.*)\@<%= subdomain.gsub(/\./, '\.') %>$/ ${1} diff --git a/templates/sympa/transport_regexp.erb b/templates/sympa/transport_regexp.erb index 1e32e2a..6323836 100644 --- a/templates/sympa/transport_regexp.erb +++ b/templates/sympa/transport_regexp.erb @@ -1,2 +1,2 @@ -/^.*+owner\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ sympabounce: -/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ sympa: +/^.*+owner\@<%= subdomain.gsub(/\./, '\.') %>$/ sympabounce: +/^.*\@<%= subdomain.gsub(/\./, '\.') %>$/ sympa: diff --git a/templates/sympa/virtual_regexp.erb b/templates/sympa/virtual_regexp.erb index f5883d7..b82b9df 100644 --- a/templates/sympa/virtual_regexp.erb +++ b/templates/sympa/virtual_regexp.erb @@ -1 +1 @@ -/^(.*)-owner\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+owner@<%= subdomain %>.$2 +/^(.*)-owner\@<%= subdomain.gsub(/\./, '\.') %>$/ $1+owner@<%= subdomain %> |