Ensure old virtual and transport regexps are removed (3)

diff --git a/manifests/firma.pp b/manifests/firma.pp
index e2ce7fe1c6a6fa38413f35dd167079d35f2bb0af..51ae7719712808212055998fce50909701c25c11 100644 (file)
--- 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 52a47663cf4e4e98f392e670cfef744674f01377..69063914074eed1a9dd21ba1b087aee167e47840 100644 (file)
--- 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'),
   }
 }