Run mailman3 on ports that do not conflict with mailman

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

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