From 9672a564612722851910c746aed51f37b08e6619 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 3 Feb 2022 11:41:25 +0000
Subject: [PATCH] Run mailman3 on ports that do not conflict with mailman
---
roles/mailman/templates/mailman.cfg.j2 | 2 +-
services.mail.yml | 21 +++++++++------------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/roles/mailman/templates/mailman.cfg.j2 b/roles/mailman/templates/mailman.cfg.j2
index 722b8ad2..14461749 100644
--- a/roles/mailman/templates/mailman.cfg.j2
+++ b/roles/mailman/templates/mailman.cfg.j2
@@ -234,7 +234,7 @@ smtp_pass:
# localhost for Postfix integration, because Postfix only consults DNS
# (e.g. not /etc/hosts).
lmtp_host: 0.0.0.0
-lmtp_port: 6087
+lmtp_port: 6187
# Where can we find the mail server specific configuration file? The path can
# be either a file system path or a Python import path. If the value starts
diff --git a/services.mail.yml b/services.mail.yml
index 0821f298..475ea61e 100644
--- a/services.mail.yml
+++ b/services.mail.yml
@@ -110,16 +110,16 @@ mail-backend:
params:
compress: true
-mailman:
+mailman3:
scheduling_group: backend
service_credentials:
- - name: mailman
+ - name: mailman3
containers:
- name: api
image: registry.git.autistici.org/ai3/docker/mailman3:master
ports:
- 8001
- - 6087
+ - 6187
volumes:
- /etc/mailman3/mailman.cfg: /etc/mailman3/mailman.cfg
- /etc/mailman3/partition_map: /etc/mailman3/partition_map
@@ -130,19 +130,17 @@ mailman:
- name: http
image: registry.git.autistici.org/ai3/docker/mailman3-web:master
ports:
- - 8087
+ - 8098
volumes:
- /etc/mailman3/mailman-web.py: /etc/mailman3/mailman-web.py
- /var/lib/mailman3: /var/lib/mailman3
env:
DOMAIN: "{{ domain_public[0] }}"
- APACHE_PORT: 8087
+ APACHE_PORT: 8098
monitoring_endpoints:
- - job_name: mailman-apache
- port: 8187
+ - port: 8198
scheme: http
- - job_name: mysql-mailman
- port: 9311
+ - port: 9311
scheme: http
public_endpoints:
# TEMPORARY public endpoint for testing.
@@ -156,9 +154,8 @@ mailman:
- 3912
- 4444
- 8001
- - 8087
- - 6087
- - 6088
+ - 8098
+ - 6187
volumes:
- name: data
path: /var/lib/mailman3
--
GitLab