aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-09-12 21:38:16 +0000
committerMichael Scherer <misc@mageia.org>2011-09-12 21:38:16 +0000
commit70eeb1b1a30cf472380f0cf20c3589ff050cf7d7 (patch)
treeb8fa375a4961d00fdd657992f6ae4658b3f2d917
parent1819a7d5667c4d8828a61cc4558f37420d099578 (diff)
downloadpuppet-70eeb1b1a30cf472380f0cf20c3589ff050cf7d7.tar
puppet-70eeb1b1a30cf472380f0cf20c3589ff050cf7d7.tar.gz
puppet-70eeb1b1a30cf472380f0cf20c3589ff050cf7d7.tar.bz2
puppet-70eeb1b1a30cf472380f0cf20c3589ff050cf7d7.tar.xz
puppet-70eeb1b1a30cf472380f0cf20c3589ff050cf7d7.zip
add header to the mail on the sympa, popular request asked on
sysadmin. Disable previous commit since the xml file is used only when the ml is created ( and not used after anymore )
-rw-r--r--modules/sympa/manifests/init.pp2
-rw-r--r--modules/sympa/templates/config2
-rw-r--r--modules/sympa/templates/list.xml3
3 files changed, 2 insertions, 5 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 24f0e4e5..ebe0a827 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -186,7 +186,7 @@ class sympa {
$subscriber_ldap_group = false,
$public_archive = true,
$subscription_open = false,
- $custom_subject = '') {
+ ) {
include sympa::variable
$ldap_password = extlookup("sympa_ldap",'x')
diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config
index 4f390729..dbf2c19e 100644
--- a/modules/sympa/templates/config
+++ b/modules/sympa/templates/config
@@ -104,4 +104,4 @@ digest 1,4 13:26
review private
-
+custom_subject [%list.name%]
diff --git a/modules/sympa/templates/list.xml b/modules/sympa/templates/list.xml
index 5be2580f..1d83125e 100644
--- a/modules/sympa/templates/list.xml
+++ b/modules/sympa/templates/list.xml
@@ -12,7 +12,4 @@
<editor_include>
<source>mga-ml_moderators</source>
</editor_include>
-<%- if custom_subject != '' -%>
- <custom_subject><%= custom_subject %></custom_subject>
-<%- end -%>
</list>