diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-22 17:14:25 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-22 17:14:25 +0000 |
| commit | 0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5 (patch) | |
| tree | fbab99d4053c047f783e7410655e4a0ca1c88a94 /modules/sympa/templates | |
| parent | de0e65f6ed000d72fff695345f304e9d042c26e6 (diff) | |
| download | puppet-0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5.tar puppet-0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5.tar.gz puppet-0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5.tar.bz2 puppet-0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5.tar.xz puppet-0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5.zip | |
sympa: merge sender_email and sender_ldap_group scenarios
So that it's possible to have both on one ML.
Diffstat (limited to 'modules/sympa/templates')
| -rw-r--r-- | modules/sympa/templates/scenari/sender.ldap_group | 5 | ||||
| -rw-r--r-- | modules/sympa/templates/scenari/sender.restricted (renamed from modules/sympa/templates/scenari/sender.email) | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/sympa/templates/scenari/sender.ldap_group b/modules/sympa/templates/scenari/sender.ldap_group deleted file mode 100644 index ac8b3fd9..00000000 --- a/modules/sympa/templates/scenari/sender.ldap_group +++ /dev/null @@ -1,5 +0,0 @@ -title.gettext restricted to group <%= @ldap_group %> - -search(<%= @ldap_group %>.ldap) smtp,md5,smime -> do_it -true() smtp,md5,smime -> reject(reason='send_subscriber') - diff --git a/modules/sympa/templates/scenari/sender.email b/modules/sympa/templates/scenari/sender.restricted index 18704f48..69da52c5 100644 --- a/modules/sympa/templates/scenari/sender.email +++ b/modules/sympa/templates/scenari/sender.restricted @@ -1,7 +1,12 @@ title.gettext restricted list -<%- for e in @email -%> +<%- if @ldap_group -%> +search(<%= @ldap_group %>.ldap) smtp,md5,smime -> do_it +<%- end -%> +<%- if @email -%> + <%- for e in @email -%> equal([sender], '<%= e %>') smtp,md5,smime -> do_it + <%- end -%> <%- end -%> true() smtp,md5,smime -> reject(reason='send_subscriber') |