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

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

diff --git a/manifests/firma.pp b/manifests/firma.pp
index a2a6ffd..e2ce7fe 100644
--- 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 3e7f1f0..52a4766 100644
--- 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 bb20b81..fd65e7e 100644
--- 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 {