summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-08-26 09:16:24 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-08-26 09:16:24 -0300
commit012f17f3f9acf8fc6f18a832715a751e379693ca (patch)
tree4df14bd2bfad59a795e4f93c55eacd230499e410
parent116bd8037b171f219880ba02c70a4c3c7d368324 (diff)
downloadpuppet-mail-012f17f3f9acf8fc6f18a832715a751e379693ca.tar.gz
puppet-mail-012f17f3f9acf8fc6f18a832715a751e379693ca.tar.bz2
Introducing parameter sympa_listmasters
-rw-r--r--manifests/system.pp4
-rw-r--r--templates/sympa/sympa.conf.erb2
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/system.pp b/manifests/system.pp
index d226191..53ec12f 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -70,6 +70,10 @@ class mail::system {
'': { $sympa_subdomain = "lists" }
}
+ case $sympa_listmasters {
+ '': { $sympa_listmasters = "listmaster@${fqdn}" }
+ }
+
case $sympa_lang {
'': { $sympa_lang = "en_US" }
}
diff --git a/templates/sympa/sympa.conf.erb b/templates/sympa/sympa.conf.erb
index 37627af..2e031a7 100644
--- a/templates/sympa/sympa.conf.erb
+++ b/templates/sympa/sympa.conf.erb
@@ -53,7 +53,7 @@ domain <%= sympa_subdomain %>.<%= domain %>
## Listmasters email list comma separated
## Sympa will associate listmaster privileges to these email addresses (mail and web interfaces). Some error reports may also be sent to these addresses.
-listmaster listmaster@.<%= fqdn %>
+listmaster <%= sympa_listmasters %>
## Local part of sympa email adresse
## Effective address will be [EMAIL]@[HOST]