diff options
Diffstat (limited to 'modules/sympa')
-rw-r--r-- | modules/sympa/manifests/init.pp | 10 | ||||
-rw-r--r-- | modules/sympa/templates/config | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index 3ffbc9c8..c014a18d 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -164,6 +164,12 @@ class sympa { $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 @@ class sympa { } 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: } } } diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config index 7f834e3d..21d8d506 100644 --- a/modules/sympa/templates/config +++ b/modules/sympa/templates/config @@ -42,7 +42,7 @@ apply forced <% if sender_email %> #TODO write scenari -send restricted_<%= sender_email %> +send restricted_<%= sender_email_file %> <% elsif sender_ldap_group %> #TODO write scenari |