From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 27 Jun 2013 19:50:33 +0000 (-0300)
Subject: Avoid duplicate definitions
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=962b4a437bda287e1b435f887ee4784584e67085;p=puppet-mail.git

Avoid duplicate definitions
---

diff --git a/manifests/mlmmj/domain.pp b/manifests/mlmmj/domain.pp
index f193cc7..c58b179 100644
--- a/manifests/mlmmj/domain.pp
+++ b/manifests/mlmmj/domain.pp
@@ -1,11 +1,11 @@
 define mail::mlmmj::domain() {
   $subdomain = $name
 
-  #postfix::transport_regexp_snippet { 'mlmmj_transport_regexp':
+  #postfix::transport_regexp_snippet { "mlmmj_transport_regexp-${name}":
   #  content => template('mail/mlmmj/transport_regexp.erb'),
   #}
 
-  postfix::virtual_regexp_snippet { 'mlmmj_virtual_regexp':
+  postfix::virtual_regexp_snippet { "mlmmj_virtual_regexp-${name}":
     content => template('mail/mlmmj/virtual_regexp.erb'),
   }
 }
diff --git a/manifests/sympa/domain.pp b/manifests/sympa/domain.pp
index 7da9a89..8cc74c6 100644
--- a/manifests/sympa/domain.pp
+++ b/manifests/sympa/domain.pp
@@ -1,11 +1,11 @@
 define mail::sympa::domain() {
   $subdomain = $name
 
-  postfix::transport_regexp_snippet { 'sympa_transport_regexp':
+  postfix::transport_regexp_snippet { "sympa_transport_regexp-${name}":
     content => template('mail/sympa/transport_regexp.erb'),
   }
 
-  postfix::virtual_regexp_snippet { 'sympa_virtual_regexp':
+  postfix::virtual_regexp_snippet { "sympa_virtual_regexp-${name}":
     content => template('mail/sympa/virtual_regexp.erb'),
   }
 }