diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-22 17:45:42 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-22 17:45:42 +0000 |
| commit | a9ffcee2b2ebe2f46609d2705e1af44d0627e827 (patch) | |
| tree | d4246ab6d2a6ec8a8b773b327ebad007ba37fbd8 /modules/sympa/templates | |
| parent | 0f5eb63dc507635367d8f2a5d9e175d2e9c3faf5 (diff) | |
| download | puppet-a9ffcee2b2ebe2f46609d2705e1af44d0627e827.tar puppet-a9ffcee2b2ebe2f46609d2705e1af44d0627e827.tar.gz puppet-a9ffcee2b2ebe2f46609d2705e1af44d0627e827.tar.bz2 puppet-a9ffcee2b2ebe2f46609d2705e1af44d0627e827.tar.xz puppet-a9ffcee2b2ebe2f46609d2705e1af44d0627e827.zip | |
sympa: merge subscriber_moderated scenari into sender.restricted scenari
Diffstat (limited to 'modules/sympa/templates')
| -rw-r--r-- | modules/sympa/templates/config | 7 | ||||
| -rw-r--r-- | modules/sympa/templates/scenari/sender.restricted | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config index 47a91f14..e55785bd 100644 --- a/modules/sympa/templates/config +++ b/modules/sympa/templates/config @@ -52,15 +52,8 @@ apply forced -<% if sender_email || sender_ldap_group %> send restricted_<%= @name %> -<% else %> -send subscriber_moderated - -<% end %> - - <% if topics %> topics <%= topics %> <% end %> diff --git a/modules/sympa/templates/scenari/sender.restricted b/modules/sympa/templates/scenari/sender.restricted index 69da52c5..05700587 100644 --- a/modules/sympa/templates/scenari/sender.restricted +++ b/modules/sympa/templates/scenari/sender.restricted @@ -8,5 +8,11 @@ search(<%= @ldap_group %>.ldap) smtp,md5,smime -> do_it equal([sender], '<%= e %>') smtp,md5,smime -> do_it <%- end -%> <%- end -%> +<%- if allow_subscriber -%> +equal([sender], 'sysadmin@group.mageia.org') smtp,smime,md5 -> do_it +match([sender], /@mageia\.org$/) smtp,smime,md5 -> do_it +is_subscriber([listname],[sender]) smtp,smime,md5 -> do_it +true() smime,md5 -> do_it +<%- end -%> true() smtp,md5,smime -> reject(reason='send_subscriber') |