Expose matrix on 8448, fix errors for ma1sd

common/docker_traefik/templates/docker-compose.yml

@@ -8,6 +8,8 @@ services:
         ports:
             - "80:80"
             - "443:443"
+{% if inventory_hostname == 'webserver' %}            - "8448:8448" 
+{% endif %}
             - "{{ int_ip4 }}:8080:8080"
         volumes:
             - "/srv/traefik/traefik.yml:/etc/traefik/traefik.yml:ro"

common/docker_traefik/templates/traefik.yml

@@ -24,6 +24,16 @@ entryPoints:
             tls:
                 certResolver: "letsencrypt"
 
+{% if inventory_hostname == 'webserver' %}
+
+    # additional entrypoint for matrix-federation 
+    matrix_federation:
+        address: ":8448"
+        http:
+            tls:
+                certResolver: "letsencrypt"
+
+{% endif %}
 
 # Discover configuration via docker 
 # use network 'web' for interconnect  

webserver/docker_matrix/templates/docker-compose.yml

@@ -18,16 +18,13 @@ services:
 
   synapse:
 
-    image: matrixdotorg/synapse:v1.21.2
+    image: matrixdotorg/synapse:v1.22.1
     restart: always
     cpu_count: "1"
     cpuset: "0"
     depends_on:
       - db
       - ma1sd
-    ports:
-      - 127.0.0.1:18008:8008
-      - 127.0.0.1:18448:8448
     volumes:
       - /srv/matrix/synapse-data/:/data
       # Python version can be found in the dockerfile: https://hub.docker.com/r/matrixdotorg/synapse/dockerfile
@@ -38,7 +35,12 @@ services:
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
       - traefik.http.routers.{{ servicename }}.entrypoints=websecure
+      - traefik.http.routers.{{ servicename }}.service={{ servicename }}
       - traefik.http.services.{{ servicename }}.loadbalancer.server.port=8008
+      - traefik.http.routers.matrix_federation.rule=Host(`{{ domain }}`)
+      - traefik.http.routers.matrix_federation.entrypoints=matrix_federation
+      - traefik.http.routers.matrix_federation.service=matrix_federation
+      - traefik.http.services.matrix_federation.loadbalancer.server.port=8448
     networks:
       - default      
       - web  
@@ -47,16 +49,14 @@ services:
 
     image: ma1uta/ma1sd:2.4.0
     restart: always
-    ports:
-      - 127.0.0.1:18090:8090
     volumes:
       - /srv/matrix/ma1sd-config/:/etc/ma1sd
       - /srv/matrix/ma1sd-data/:/var/ma1sd
     labels:
       - traefik.enable=true
       - traefik.http.routers.{{ servicename }}-ma1sd.rule=((Host(`{{ domain }}`) && PathPrefix(`/_matrix/client/r0/login`)) || (Host(`{{ domain }}`) && PathPrefix(`/_matrix/identity`)))
-      - traefik.http.routers.{{ servicename }}-login.entrypoints=websecure
-      - traefik.http.services.{{ servicename }}-login.loadbalancer.server.port=8090
+      - traefik.http.routers.{{ servicename }}-ma1sd.entrypoints=websecure
+      - traefik.http.services.{{ servicename }}-ma1sd.loadbalancer.server.port=8090
     networks:
       - default      
       - web