diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-27 16:59:34 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-27 16:59:34 -0300 |
| commit | 6af3f3f188444ae365383e4c4f6be23af967495c (patch) | |
| tree | 9cc2a81837b415db1d95959df30e87526d3489fa | |
| parent | 962b4a437bda287e1b435f887ee4784584e67085 (diff) | |
| download | puppet-mail-6af3f3f188444ae365383e4c4f6be23af967495c.tar.gz puppet-mail-6af3f3f188444ae365383e4c4f6be23af967495c.tar.bz2 | |
Ensure old virtual and transport regexps are removed
| -rw-r--r-- | manifests/firma.pp | 10 | ||||
| -rw-r--r-- | manifests/mlmmj.pp | 10 | ||||
| -rw-r--r-- | manifests/sympa.pp | 10 |
3 files changed, 30 insertions, 0 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp index 5662733..a2a6ffd 100644 --- a/manifests/firma.pp +++ b/manifests/firma.pp @@ -9,6 +9,16 @@ class mail::firma( mail::firma::domain { "${subdomain}.${domain}": } + # TODO: remove in the future + postfix::transport_regexp_snippet { "firma_transport_regexp": + ensure => absent, + } + + # TODO: remove in the future + postfix::virtual_regexp_snippet { "firma_virtual_regexp": + ensure => absent, + } + postfix::transport { "${subdomain}.$domain": ensure => absent, destination => "firma", diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp index 56bfc64..3e7f1f0 100644 --- a/manifests/mlmmj.pp +++ b/manifests/mlmmj.pp @@ -33,4 +33,14 @@ class mail::mlmmj( #} mail::mlmmj::domain { "${subdomain}.${domain}": } + + # TODO: remove in the future + postfix::transport_regexp_snippet { "firma_transport_regexp": + ensure => absent, + } + + # TODO: remove in the future + postfix::virtual_regexp_snippet { "firma_virtual_regexp": + ensure => absent, + } } diff --git a/manifests/sympa.pp b/manifests/sympa.pp index 2c9a373..bb20b81 100644 --- a/manifests/sympa.pp +++ b/manifests/sympa.pp @@ -104,6 +104,16 @@ class mail::sympa( mail::sympa::domain { "${subdomain}.${domain}": } + # TODO: remove in the future + postfix::transport_regexp_snippet { "firma_transport_regexp": + ensure => absent, + } + + # TODO: remove in the future + postfix::virtual_regexp_snippet { "firma_virtual_regexp": + ensure => absent, + } + postfix::config { "sympa_destination_recipient_limit": value => '1', nonstandard => true; "sympabounce_destination_recipient_limit": value => '1', nonstandard => true; |