Modified: puppet/modules/sympa/manifests/init.pp
===================================================================
--- puppet/modules/sympa/manifests/init.pp 2010-12-14 18:29:43 UTC (rev 606)
+++ puppet/modules/sympa/manifests/init.pp 2010-12-14 18:29:44 UTC (rev 607)
@@ -164,6 +164,12 @@
$xml_file = "/etc/sympa/lists_xml/$name.xml"
+ if $sender_email {
+ $sender_email_file = regsubst($sender_email,'\@','-at-')
+ } else {
+ $sender_email_file = ''
+ }
+
file { "$xml_file":
owner => root,
group => root,
@@ -191,8 +197,8 @@
}
if $sender_email {
- if ! defined(Sympa::Server::Scenario_sender_email[$sender_email]) {
- sympa::server::scenario_sender_email { $sender_email: }
+ if ! defined(Sympa::Server::Scenario_sender_email[$sender_email_file]) {
+ sympa::server::scenario_sender_email { $sender_email_file: }
}
}
Modified: puppet/modules/sympa/templates/config
===================================================================
--- puppet/modules/sympa/templates/config 2010-12-14 18:29:43 UTC (rev 606)
+++ puppet/modules/sympa/templates/config 2010-12-14 18:29:44 UTC (rev 607)
@@ -42,7 +42,7 @@
<% if sender_email %>
#TODO write scenari
-send restricted_<%= sender_email %>
+send restricted_<%= sender_email_file %>
<% elsif sender_ldap_group %>
#TODO write scenari