Ensure old virtual and transport regexps are removed

diff --git a/manifests/firma.pp b/manifests/firma.pp
index 56627330e8702406c757b57bf683aecdc5eb411a..a2a6ffd4e147d4707bcee977d727cf5558f79650 100644 (file)
--- 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 56bfc647ece4a7366885521f2063a475f135793e..3e7f1f0e536df0b6658afaa866433b7c12cdea46 100644 (file)
--- 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 2c9a3732eafc8f08031daba6043f8ae759bf59b9..bb20b81be7b8b7cfd2897f4e75a1348ba54e914e 100644 (file)
--- 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;