summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-27 16:50:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-27 16:50:33 -0300
commit962b4a437bda287e1b435f887ee4784584e67085 (patch)
tree219c8be575d578ef2c6f0b688818e813be99f1a6
parentf9f925230cee5c41f77357b7b1c8925e4a0caf7c (diff)
downloadpuppet-mail-962b4a437bda287e1b435f887ee4784584e67085.tar.gz
puppet-mail-962b4a437bda287e1b435f887ee4784584e67085.tar.bz2
Avoid duplicate definitions
-rw-r--r--manifests/mlmmj/domain.pp4
-rw-r--r--manifests/sympa/domain.pp4
2 files changed, 4 insertions, 4 deletions
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'),
}
}