diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-22 15:36:49 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-22 15:36:49 +0000 |
| commit | c64d294fd0dfcaaa65aa6d2b7f967dcd9090258e (patch) | |
| tree | aff02a09994c1a4ddb383a01e1fc418c0b07be95 /modules/sympa/manifests | |
| parent | 2909164ddc5a6a8741a9a4863e80aa6a376a8e68 (diff) | |
| download | puppet-c64d294fd0dfcaaa65aa6d2b7f967dcd9090258e.tar puppet-c64d294fd0dfcaaa65aa6d2b7f967dcd9090258e.tar.gz puppet-c64d294fd0dfcaaa65aa6d2b7f967dcd9090258e.tar.bz2 puppet-c64d294fd0dfcaaa65aa6d2b7f967dcd9090258e.tar.xz puppet-c64d294fd0dfcaaa65aa6d2b7f967dcd9090258e.zip | |
sympa: create scenario files by ML name
Diffstat (limited to 'modules/sympa/manifests')
| -rw-r--r-- | modules/sympa/manifests/list.pp | 8 | ||||
| -rw-r--r-- | modules/sympa/manifests/scenario/sender_email.pp | 5 | ||||
| -rw-r--r-- | modules/sympa/manifests/scenario/sender_ldap_group.pp | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/modules/sympa/manifests/list.pp b/modules/sympa/manifests/list.pp index 4e265f31..7b613297 100644 --- a/modules/sympa/manifests/list.pp +++ b/modules/sympa/manifests/list.pp @@ -41,14 +41,14 @@ define sympa::list( $subject, } if $sender_ldap_group { - if ! defined(Sympa::Scenario::Sender_ldap_group[$sender_ldap_group]) { - sympa::scenario::sender_ldap_group { $sender_ldap_group: } + sympa::scenario::sender_ldap_group { $name: + ldap_group => $sender_ldap_group, } } if $sender_email { - if ! defined(Sympa::Scenario::Sender_email[$sender_email]) { - sympa::scenario::sender_email { $sender_email: } + sympa::scenario::sender_email { $name: + email => $sender_email, } } diff --git a/modules/sympa/manifests/scenario/sender_email.pp b/modules/sympa/manifests/scenario/sender_email.pp index 4f811189..7f4bc688 100644 --- a/modules/sympa/manifests/scenario/sender_email.pp +++ b/modules/sympa/manifests/scenario/sender_email.pp @@ -1,6 +1,5 @@ -define sympa::scenario::sender_email { - $sender_email_file = regsubst($name,'\@','-at-') - file { "/etc/sympa/scenari/send.restricted_$sender_email_file": +define sympa::scenario::sender_email($email) { + file { "/etc/sympa/scenari/send.restricted_$name": content => template('sympa/scenari/sender.email') } } diff --git a/modules/sympa/manifests/scenario/sender_ldap_group.pp b/modules/sympa/manifests/scenario/sender_ldap_group.pp index 363af4f3..70915080 100644 --- a/modules/sympa/manifests/scenario/sender_ldap_group.pp +++ b/modules/sympa/manifests/scenario/sender_ldap_group.pp @@ -1,4 +1,4 @@ -define sympa::scenario::sender_ldap_group { +define sympa::scenario::sender_ldap_group($ldap_group) { file { "/etc/sympa/scenari/send.restricted_$name": content => template('sympa/scenari/sender.ldap_group') } |