diff --git a/element/config.json b/element/config.json index 1aa2e6b..018a020 100644 --- a/element/config.json +++ b/element/config.json @@ -1,7 +1,7 @@ { "default_server_config": { "m.homeserver": { - "base_url": "https://matrix.maby.dev" + "base_url": "https://matrix.gmoker.com" } }, "setting_defaults": { diff --git a/matrix/compose.yaml b/matrix/compose.yaml index e435d0f..102ceb1 100644 --- a/matrix/compose.yaml +++ b/matrix/compose.yaml @@ -1,6 +1,6 @@ --- services: - matrix_install_site: + synapse_install_site: build: install_site environment: - BASE_URL=$MATRIX_BASE_URL @@ -32,21 +32,26 @@ services: - POSTGRES_PASSWORD - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C + redis: + image: docker.io/redis:latest + restart: unless-stopped + coturn: build: coturn - network: host # TODO: https://github.com/instrumentisto/coturn-docker-image/issues/3 + restart: unless-stopped + network_mode: host # TODO: https://github.com/instrumentisto/coturn-docker-image/issues/3 tmpfs: - - tmpfs:/var/lib/coturn/ + - /var/lib/coturn/ environment: - - BASE_URL=COTURN_BASE_URL + - BASE_URL=$COTURN_BASE_URL - AUTH_SECRET synapse: build: synapse restart: unless-stopped volumes: - - config:/config/ - - data:/data/ + - synapse_config:/config/ + - synapse_data:/data/ environment: - SYNAPSE_SERVER_NAME=$SYNAPSE_BASE_URL - SYNAPSE_CONFIG_DIR=/config @@ -69,8 +74,8 @@ volumes: certbotroot: external: true db: - config: - data: + synapse_config: + synapse_data: networks: nginx: diff --git a/matrix/coturn/Dockerfile b/matrix/coturn/Dockerfile index f823a02..cca7c3a 100644 --- a/matrix/coturn/Dockerfile +++ b/matrix/coturn/Dockerfile @@ -1,9 +1,12 @@ FROM docker.io/coturn/coturn:4.6 +USER root RUN apt-get update \ && apt-get install -y --no-install-recommends \ - gettext \ + gettext-base \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /usr/local/bin/ COPY turnserver.conf /etc/coturn/ +RUN chown nobody:nogroup -R /etc/coturn/ +USER nobody:nogroup ENTRYPOINT ["entrypoint.sh"] CMD ["turnserver"] diff --git a/matrix/init_config.sh b/matrix/init_config.sh index 7275610..cf2bf75 100755 --- a/matrix/init_config.sh +++ b/matrix/init_config.sh @@ -5,6 +5,8 @@ set -a SYNAPSE_SERVER_NAME="$MATRIX_BASE_URL" SYNAPSE_NO_TLS=1 POSTGRES_HOST=db + SYNAPSE_TURN_URIS="turn:$COTURN_BASE_URL?transport=tcp,turn:$COTURN_BASE_URL?transport=udp" + SYNAPSE_TURN_SECRET=$AUTH_SECRET set +a ENV=() diff --git a/matrix/synapse/Dockerfile b/matrix/synapse/Dockerfile index 6968805..3f64809 100644 --- a/matrix/synapse/Dockerfile +++ b/matrix/synapse/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/matrixdotorg/synapse:v1.98.0 +FROM docker.io/matrixdotorg/synapse:v1.100.0 COPY entrypoint.sh /usr/local/bin/ ENTRYPOINT ["entrypoint.sh"] CMD ["/start.py"]