diff options
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') |