diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:01:00 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:01:00 -0200 |
| commit | 86515e9a0f27d36e38faee05beb03cbb99677e73 (patch) | |
| tree | 355b620ee9ea98be6d54f87c506b64b2024c8076 /templates/postfix/firma | |
| parent | 14d954ff02564493192fe1fc9ad3a148ba20ef60 (diff) | |
| download | puppet-mail-86515e9a0f27d36e38faee05beb03cbb99677e73.tar.gz puppet-mail-86515e9a0f27d36e38faee05beb03cbb99677e73.tar.bz2 | |
Refactoring for 2.7 compatibility
Diffstat (limited to 'templates/postfix/firma')
| -rw-r--r-- | templates/postfix/firma/transport_regexp.erb | 4 | ||||
| -rw-r--r-- | templates/postfix/firma/virtual_regexp.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/postfix/firma/transport_regexp.erb b/templates/postfix/firma/transport_regexp.erb index a15fc5a..27c65af 100644 --- a/templates/postfix/firma/transport_regexp.erb +++ b/templates/postfix/firma/transport_regexp.erb @@ -1,2 +1,2 @@ -/^.*+request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest: -/^.*\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firma: +/^.*+request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest: +/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firma: diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb index 7ba1b16..767f3c1 100644 --- a/templates/postfix/firma/virtual_regexp.erb +++ b/templates/postfix/firma/virtual_regexp.erb @@ -1 +1 @@ -/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+request@<%= firma_subdomain %>.$2 +/^(.*)-request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+request@<%= subdomain %>.$2 |