From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Jun 2013 19:59:34 +0000 (-0300)
Subject: Ensure old virtual and transport regexps are removed
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6af3f3f188444ae365383e4c4f6be23af967495c;p=puppet-mail.git

Ensure old virtual and transport regexps are removed
---

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;