summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-27 17:05:22 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-27 17:05:22 -0300
commit66dfa498fd9215a5b954cc17518d42cc56e497c0 (patch)
treebf61811c05895797cf4358cde5b3c85373309ce3
parent3a200132e45b5ecb547e87aa082f127f5cd0fd63 (diff)
downloadpuppet-mail-66dfa498fd9215a5b954cc17518d42cc56e497c0.tar.gz
puppet-mail-66dfa498fd9215a5b954cc17518d42cc56e497c0.tar.bz2
Ensure old virtual and transport regexps are removed (3)
-rw-r--r--manifests/firma.pp4
-rw-r--r--manifests/mlmmj.pp4
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp
index e2ce7fe..51ae771 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -12,13 +12,13 @@ class mail::firma(
# TODO: remove in the future
postfix::transport_regexp_snippet { "firma_transport_regexp":
ensure => absent,
- content => template('mail/sympa/transport_regexp.erb'),
+ content => template('mail/firma/transport_regexp.erb'),
}
# TODO: remove in the future
postfix::virtual_regexp_snippet { "firma_virtual_regexp":
ensure => absent,
- content => template('mail/sympa/virtual_regexp.erb'),
+ content => template('mail/firma/virtual_regexp.erb'),
}
postfix::transport { "${subdomain}.$domain":
diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index 52a4766..6906391 100644
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -37,12 +37,12 @@ class mail::mlmmj(
# TODO: remove in the future
postfix::transport_regexp_snippet { "mlmmj_transport_regexp":
ensure => absent,
- content => template('mail/sympa/transport_regexp.erb'),
+ content => template('mail/mlmmj/transport_regexp.erb'),
}
# TODO: remove in the future
postfix::virtual_regexp_snippet { "mlmmj_virtual_regexp":
ensure => absent,
- content => template('mail/sympa/virtual_regexp.erb'),
+ content => template('mail/mlmmj/virtual_regexp.erb'),
}
}