diff --git a/deploy_matrix.yml b/deploy_matrix.yml index 9b9ba47..99d5cad 100644 --- a/deploy_matrix.yml +++ b/deploy_matrix.yml @@ -129,24 +129,7 @@ network: "{{ podman_network }}" # ----------------------------------------------------------------- - # Start the NGINX container - # ----------------------------------------------------------------- - # - name: Start NGINX landing-page container - # containers.podman.podman_container: - # name: landing - # image: "{{ nginx_image }}" - # state: started - # ports: - # - "8080:80" - # volumes: - # - "{{ vol_nginx }}:/usr/share/nginx/html:ro" - # - "{{ nginx_html_path }}:/usr/share/nginx/html/index.html:ro" - # network: "{{ podman_network }}" - # restart_policy: always - - - # ----------------------------------------------------------------- - # Start containers (Traefik, TURN, Synapse, NGINX – unchanged) + # Start the Coturn container # ----------------------------------------------------------------- - name: Start coturn container @@ -166,6 +149,11 @@ network: "{{ podman_network }}" restart_policy: always + + # ----------------------------------------------------------------- + # Start the Matrix-Synaps and supporting DB containers + # ----------------------------------------------------------------- + - name: start Database container containers.podman.podman_container: name: synapse-db @@ -196,25 +184,10 @@ network: "{{ podman_network }}" restart_policy: always - - - - # - name: Start NGINX landing-page container - # containers.podman.podman_container: - # name: landing - # image: "{{ nginx_image }}" - # state: started - # ports: - # - "8080:80" - # volumes: - # - "{{ vol_nginx }}:/usr/share/nginx/html:ro" - # - "{{ nginx_html_path }}:/usr/share/nginx/html/index.html:ro" - # network: "{{ podman_network }}" - # restart_policy: always - # ----------------------------------------------------------------- - # Start Teamspeak container + # Start the Teamspeak Container # ----------------------------------------------------------------- + - name: Start Teamspeak container containers.podman.podman_container: name: "{{ teamspeak_container_name }}" diff --git a/templates/homeserver.yaml.j2 b/templates/homeserver.yaml.j2 index ec5bc08..9f08cce 100644 --- a/templates/homeserver.yaml.j2 +++ b/templates/homeserver.yaml.j2 @@ -12,13 +12,14 @@ listeners: x_forwarded: true turn_uris: - - "turn:{{ matrix_container_name }}:{{ turn_listen_port }}?transport=udp - - "turn:{{ matrix_container_name }}:{{ turn_tls_port }}?transport=tcp - - "turns:{{ matrix_container_name }}:{{ turn_tls_port }}?transport=tcp - - "turns:{{ matrix_container_name }}:{{ turn_listen_port }}?transport=udp + - "turn:{{ matrix_container_name }}:{{ turn_listen_port }}?transport=udp" + - "turn:{{ matrix_container_name }}:{{ turn_tls_port }}?transport=tcp" + - "turns:{{ matrix_container_name }}:{{ turn_tls_port }}?transport=tcp" + - "turns:{{ matrix_container_name }}:{{ turn_listen_port }}?transport=udp" turn_shared_secret: "{{ turn_secret }}" turn_user_lifetime: "1h" +turn_allow_guests: "true" media_store_path: /data/media_store diff --git a/vars/vars.yml b/vars/vars.yml index 3f4aaef..eb6d70e 100644 --- a/vars/vars.yml +++ b/vars/vars.yml @@ -3,8 +3,9 @@ # -------------------------------------------------------------- public_ipv4: "15.204.117.53" matrix_domain1: "matrix.fpov.space" -landing_domain: "org.fpov.space" +site_domain: "org.fpov.space" teamspeak_domain: "ts.fpov.space" +turn_domain: "turn.fpov.space" matrix_email: "boxswappers@gmail.com"