diff --git a/roles/mailman3/files/forced_params b/roles/mailman3/files/forced_params deleted file mode 100644 index 58cbd7463b61e1dbc81921171eddc86b4861e3a6..0000000000000000000000000000000000000000 --- a/roles/mailman3/files/forced_params +++ /dev/null @@ -1,6 +0,0 @@ -send_reminders = 0 -archive_volume_frequency = 1 -gateway_to_news = 0 -gateway_to_mail = 0 -dmarc_moderation_action = 1 -respond_to_post_requests = 0 diff --git a/roles/mailman3/files/mailman.mtail b/roles/mailman3/files/mailman.mtail deleted file mode 100644 index 63c4ac74eb04aac268a3828d9053c4919a4103c4..0000000000000000000000000000000000000000 --- a/roles/mailman3/files/mailman.mtail +++ /dev/null @@ -1,28 +0,0 @@ -counter mailman_received_messages_total -counter mailman_sent_messages_total -counter mailman_recipients_total - -def syslog { - /^(?P<date>(?P<legacy_date>\w+\s+\d+\s+\d+:\d+:\d+)|(?P<rfc3339_date>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+[-+]\d{2}:\d{2}))/ + /\s+(?:\w+@)?(?P<hostname>[-\w\.]+)\s+/ { - len($legacy_date) > 0 { - strptime($2, "Jan _2 15:04:05") - } - len($rfc3339_date) > 0 { - strptime($rfc3339_date, "2006-01-02T15:04:05.000000-07:00") - } - next - } -} - -@syslog { - /mailman: / { - /post to .* from .*, success$/ { - mailman_received_messages_total++ - } - - /.* smtp to .* for (?P<recipients>\d+) recips,/ { - mailman_sent_messages_total++ - mailman_recipients_total += $recipients - } - } -} diff --git a/roles/mailman3/files/node-exporter-scripts/mailman-qfiles.sh b/roles/mailman3/files/node-exporter-scripts/mailman-qfiles.sh deleted file mode 100644 index 8b790f1b55f20f6a991b5a778ca999f07743f292..0000000000000000000000000000000000000000 --- a/roles/mailman3/files/node-exporter-scripts/mailman-qfiles.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -eu - -test -d /var/lib/mailman/qfiles || exit 0 - -queues="archive retry commands virgin bounces shunt out in news" - -for queue in $queues; do - metric="mailman_qfiles_total{queue=\"${queue}\"}" - value="-1" - qdir="/var/lib/mailman/qfiles/${queue}" - if [ -d $qdir ]; then - value=$(find $qdir -type f | wc -l) - fi - echo "${metric} ${value}" -done diff --git a/roles/mailman3/templates/backup/mailman-source.yml.j2 b/roles/mailman3/templates/backup/mailman-source.yml.j2 deleted file mode 100644 index 826013266f31fac0dd5ef1f9b5484fcbe74b67b0..0000000000000000000000000000000000000000 --- a/roles/mailman3/templates/backup/mailman-source.yml.j2 +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: mailman - handler: file - schedule: "@random_every 1d" - params: - path: /var/lib/mailman - datasets: - - atoms_command: "/opt/ai/bin/tabacco-atoms --source=mailman" diff --git a/roles/mailman3/templates/mailman.cfg.j2 b/roles/mailman3/templates/mailman.cfg.j2 index 9adf48363939bddf23e5ccdb0db348339c0f910d..d9bb46148564f8618a545cf1df8c80014c032751 100644 --- a/roles/mailman3/templates/mailman.cfg.j2 +++ b/roles/mailman3/templates/mailman.cfg.j2 @@ -242,4 +242,4 @@ lmtp_port: 6187 # the current working directory. Python paths should not include the trailing # .cfg, which the file must end with. #configuration: python:mailman.config.exim4 -configuration: /etc/mailman3/postfix.cfg +#configuration: /etc/mailman3/postfix.cfg diff --git a/roles/mailman3/templates/mailman_api.conf.j2 b/roles/mailman3/templates/mailman_api.conf.j2 deleted file mode 100644 index 0d9a391d60e2b7109db14b202fe33a5a7e8e75a7..0000000000000000000000000000000000000000 --- a/roles/mailman3/templates/mailman_api.conf.j2 +++ /dev/null @@ -1,18 +0,0 @@ -# Configuration for python-mailman-api. - -SSL_CERT = '/etc/credentials/x509/mailman/server/cert.pem' -SSL_KEY = '/etc/credentials/x509/mailman/server/private_key.pem' -SSL_CA = '/etc/credentials/x509/mailman/ca.pem' - -SSO_LOGIN_SERVER = 'https://login.{{ domain_public[0] }}' -SSO_SERVICE = 'mailman.{{ domain }}/' -SSO_DOMAIN = '{{ domain_public[0] }}' -SSO_GROUPS = ['admins', 'users'] - -TLS_AUTH_ACLS = [ - ('/api/pwreset', r'(accounts|accountadmin)\.{{ domain | regex_escape }}'), - ('/api/create_list', r'mailman\.{{ domain | regex_escape }}'), - ('/api/get_list_attrs', r'mailman\.{{ domain | regex_escape }}'), -] - -MAILMAN_URL_HOST = 'www.autistici.org'