diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-14 18:29:44 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-14 18:29:44 +0000 |
| commit | 5f9c4064b5f0f8659295be2c45204b67a33c4627 (patch) | |
| tree | 712e8753c22013fbd6e446015ed92003ef4c09ed /modules/sympa | |
| parent | 64b8a6bde128ef763d48d5ae0337325d72083722 (diff) | |
| download | puppet-5f9c4064b5f0f8659295be2c45204b67a33c4627.tar puppet-5f9c4064b5f0f8659295be2c45204b67a33c4627.tar.gz puppet-5f9c4064b5f0f8659295be2c45204b67a33c4627.tar.bz2 puppet-5f9c4064b5f0f8659295be2c45204b67a33c4627.tar.xz puppet-5f9c4064b5f0f8659295be2c45204b67a33c4627.zip | |
do not use @ in filename, this confuse sympa ( and so, replace it by
-at- )
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 |