Ensure old virtual and transport regexps are removed (2)

diff --git a/manifests/firma.pp b/manifests/firma.pp
index a2a6ffd4e147d4707bcee977d727cf5558f79650..e2ce7fe1c6a6fa38413f35dd167079d35f2bb0af 100644 (file)
--- 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 3e7f1f0e536df0b6658afaa866433b7c12cdea46..52a47663cf4e4e98f392e670cfef744674f01377 100644 (file)
--- 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 bb20b81be7b8b7cfd2897f4e75a1348ba54e914e..fd65e7ef6437cde69734ce2f9e662aa4f810fb4b 100644 (file)
--- 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 {