Avoid duplicate definitions

diff --git a/manifests/mlmmj/domain.pp b/manifests/mlmmj/domain.pp
index f193cc7640199bb352794dd05f8e31db8bb78652..c58b179b27f8aaf10333ec2332d8b81cadbaebb3 100644 (file)
--- 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 7da9a891392ec2e3c191eae2cd96ee60568d511b..8cc74c62c8ef6aca8ceb1faeefd1f95451eb633d 100644 (file)
--- 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'),
   }
 }