diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-04-11 20:39:40 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-04-11 20:39:40 -0300 |
| commit | f5b8ec2d957259a0c8e9213d4cdea26be4c3d498 (patch) | |
| tree | 7e22275ef1649781937c9dfce88ad24bfac9c6d7 | |
| parent | ff887b27067ff733091b4488640e8e3b64c0886a (diff) | |
| download | puppet-mail-f5b8ec2d957259a0c8e9213d4cdea26be4c3d498.tar.gz puppet-mail-f5b8ec2d957259a0c8e9213d4cdea26be4c3d498.tar.bz2 | |
Adding virtual regexp for firma
| -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 |