diff options
| -rw-r--r-- | manifests/firma.pp | 4 | ||||
| -rw-r--r-- | templates/postfix/firma/transport_regexp.erb | 2 | ||||
| -rw-r--r-- | templates/postfix/firma/virtual_regexp.erb | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp index 3e137e6..a858e7f 100644 --- a/manifests/firma.pp +++ b/manifests/firma.pp @@ -8,6 +8,10 @@ class mail::firma { content => template('mail/postfix/firma/transport_regexp.erb'), } + postfix::virtual_regexp_snippet { 'firma_virtual_regexp': + content => template('mail/postfix/firma/virtual_regexp.erb'), + } + postfix::transport { "${firma_subdomain}.$domain": ensure => absent, destination => "firma", diff --git a/templates/postfix/firma/transport_regexp.erb b/templates/postfix/firma/transport_regexp.erb index a6a940b..a15fc5a 100644 --- a/templates/postfix/firma/transport_regexp.erb +++ b/templates/postfix/firma/transport_regexp.erb @@ -1,2 +1,2 @@ -/^.*-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest: +/^.*+request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest: /^.*\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firma: diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb new file mode 100644 index 0000000..9d7f6b9 --- /dev/null +++ b/templates/postfix/firma/virtual_regexp.erb @@ -0,0 +1 @@ +/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+request@$2 |