summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-03-21 10:36:08 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-03-21 10:36:08 -0300
commit43ee6682ec3b1b550379ab8e9a3f96244bb9062f (patch)
treeff82dc72dcf5aec332d435269c3df5cc153fbdf8 /manifests
parentd130ff86ad08f5e73fa01f21a7ddfcc56e8b2cea (diff)
downloadpuppet-mail-43ee6682ec3b1b550379ab8e9a3f96244bb9062f.tar.gz
puppet-mail-43ee6682ec3b1b550379ab8e9a3f96244bb9062f.tar.bz2
Cleanup
Diffstat (limited to 'manifests')
-rw-r--r--manifests/firma.pp12
-rw-r--r--manifests/mlmmj/domain.pp6
-rw-r--r--manifests/sympa.pp12
3 files changed, 0 insertions, 30 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp
index 3d5194f..dafbbcb 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -9,18 +9,6 @@ class mail::firma(
mail::firma::domain { "${subdomain}.${domain}": }
- # TODO: remove in the future
- postfix::transport_regexp_snippet { "firma_transport_regexp":
- ensure => absent,
- content => template('mail/firma/transport_regexp.erb'),
- }
-
- # TODO: remove in the future
- postfix::virtual_regexp_snippet { "firma_virtual_regexp":
- ensure => absent,
- content => template('mail/firma/virtual_regexp.erb'),
- }
-
postfix::transport { "${subdomain}.$domain":
ensure => absent,
destination => "firma",
diff --git a/manifests/mlmmj/domain.pp b/manifests/mlmmj/domain.pp
index 939036a..d8c7f27 100644
--- a/manifests/mlmmj/domain.pp
+++ b/manifests/mlmmj/domain.pp
@@ -4,10 +4,4 @@ define mail::mlmmj::domain() {
#postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}":
# content => template('mail/mlmmj/transport_regexp.erb'),
#}
-
- # TODO: This is not needed anymore as everything ins handled by mail::mlmmj::list
- postfix::virtual_regexp_snippet { "mlmmj_virtual_regexp-${name}":
- ensure => absent,
- content => template('mail/mlmmj/virtual_regexp.erb'),
- }
}
diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 94c89ad..6ddf0dc 100644
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -113,18 +113,6 @@ class mail::sympa(
mail::sympa::domain { "${subdomain}.${domain}": }
- # TODO: remove in the future
- 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 { "sympa_virtual_regexp":
- ensure => absent,
- content => template('mail/sympa/virtual_regexp.erb'),
- }
-
postfix::config {
"sympa_destination_recipient_limit": value => '1', nonstandard => true;
"sympabounce_destination_recipient_limit": value => '1', nonstandard => true;