summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-27 17:03:15 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-27 17:03:15 -0300
commit3a200132e45b5ecb547e87aa082f127f5cd0fd63 (patch)
treef24135636834b54fdcf0e67c7904a93882dc719d /manifests
parent6af3f3f188444ae365383e4c4f6be23af967495c (diff)
downloadpuppet-mail-3a200132e45b5ecb547e87aa082f127f5cd0fd63.tar.gz
puppet-mail-3a200132e45b5ecb547e87aa082f127f5cd0fd63.tar.bz2
Ensure old virtual and transport regexps are removed (2)
Diffstat (limited to 'manifests')
-rw-r--r--manifests/firma.pp6
-rw-r--r--manifests/mlmmj.pp10
-rw-r--r--manifests/sympa.pp10
3 files changed, 16 insertions, 10 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp
index a2a6ffd..e2ce7fe 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -11,12 +11,14 @@ class mail::firma(
# TODO: remove in the future
postfix::transport_regexp_snippet { "firma_transport_regexp":
- ensure => absent,
+ ensure => absent,
+ content => template('mail/sympa/transport_regexp.erb'),
}
# TODO: remove in the future
postfix::virtual_regexp_snippet { "firma_virtual_regexp":
- ensure => absent,
+ ensure => absent,
+ content => template('mail/sympa/virtual_regexp.erb'),
}
postfix::transport { "${subdomain}.$domain":
diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index 3e7f1f0..52a4766 100644
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -35,12 +35,14 @@ class mail::mlmmj(
mail::mlmmj::domain { "${subdomain}.${domain}": }
# TODO: remove in the future
- postfix::transport_regexp_snippet { "firma_transport_regexp":
- ensure => absent,
+ postfix::transport_regexp_snippet { "mlmmj_transport_regexp":
+ ensure => absent,
+ content => template('mail/sympa/transport_regexp.erb'),
}
# TODO: remove in the future
- postfix::virtual_regexp_snippet { "firma_virtual_regexp":
- ensure => absent,
+ postfix::virtual_regexp_snippet { "mlmmj_virtual_regexp":
+ ensure => absent,
+ content => template('mail/sympa/virtual_regexp.erb'),
}
}
diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index bb20b81..fd65e7e 100644
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -105,13 +105,15 @@ class mail::sympa(
mail::sympa::domain { "${subdomain}.${domain}": }
# TODO: remove in the future
- postfix::transport_regexp_snippet { "firma_transport_regexp":
- ensure => absent,
+ postfix::transport_regexp_snippet { "sympa_transport_regexp":
+ ensure => absent,
+ content => template('mail/sympa/transport_regexp.erb'),
}
# TODO: remove in the future
- postfix::virtual_regexp_snippet { "firma_virtual_regexp":
- ensure => absent,
+ postfix::virtual_regexp_snippet { "sympa_virtual_regexp":
+ ensure => absent,
+ content => template('mail/sympa/virtual_regexp.erb'),
}
postfix::config {