diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml index f697d3f5b1fc7f548849850f4a44b8cf71f54556..c1471941e5bc9cb058248c70edf08366c71239e2 100644 --- a/roles/mailman3/tasks/main.yml +++ b/roles/mailman3/tasks/main.yml @@ -79,28 +79,24 @@ notify: Restart mailman3-web # When notifying moderators daily, add link to moderation page -- blockinfile: +- name: Patch daily moderation mails + blockinfile: path: /usr/lib/python3/dist-packages/mailman/commands/cli_notify.py marker: "{mark}" - marker_begin: '# XXX This should be a template.' - marker_end: 'msg = OwnerNotification(mlist, subject, text, mlist.administrators)' - block: |- - text = _("""La liste {} a {} requêtes de modération en attente. + marker_begin: ' # XXX This should be a template.' + marker_end: ' msg = OwnerNotification(mlist, subject, text, mlist.administrators)' + block: " text = _(\"\"\"La liste {} a {} requêtes de modération en attente.\n\n{}\n\nVous pouvez gérer ces demandes via votre interface web :\nhttps://{{ mailman3.web_domains[0] }}/postorius/lists/{}/held_messages\n\"\"\").format(mlist.fqdn_listname, count, detail, mlist.fqdn_listname)" -{} - -Vous pouvez gérer ces demandes via votre interface web : -https://{{ mailman3.web_domains[0] }}/postorius/lists/{}/held_messages - -# Owner notifications are sent from listname-bounces@domain. -- lineinfile: +- name: Send owner notifications from listname-bounces@domain + lineinfile: path: /usr/lib/python3/dist-packages/mailman/email/message.py regexp: ' sender =' line: ' sender = f"{mlist.list_name}-bounces@{mlist.domain.mail_host}"' # When notifying moderators of a new incoming message, add link to moderation page -- template: +- name: Patch moderation requests messages + template: src: mailman/templates/fr/list:admin:action:post.txt.j2 dest: /usr/lib/python3/dist-packages/mailman/templates/fr/list:admin:action:post.txt owner: root