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

Ensure old virtual and transport regexps are removed (3)
---

diff --git a/manifests/firma.pp b/manifests/firma.pp
index e2ce7fe..51ae771 100644
--- 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 52a4766..6906391 100644
--- 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'),
   }
 }