From 5d946e8a340f95a98e13010374dd4dd5475144a8 Mon Sep 17 00:00:00 2001 From: AngeD Date: Fri, 1 Dec 2023 15:20:05 +0100 Subject: [PATCH] feat(matrix): bootstrap script --- _nginx/compose.yaml | 1 + matrix/.env | 3 +++ matrix/compose.yaml | 5 +---- matrix/init_config.sh | 15 +++++++++++++++ matrix/new_user.sh | 4 ++-- matrix/nginx.conf | 6 +++--- nextcloud/nginx.conf | 1 - 7 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 matrix/init_config.sh diff --git a/_nginx/compose.yaml b/_nginx/compose.yaml index e13052d..9ebb25b 100644 --- a/_nginx/compose.yaml +++ b/_nginx/compose.yaml @@ -7,6 +7,7 @@ services: ports: - "80:80" - "443:443" + - "8448:8448" # matrix federation volumes: - sites:/etc/nginx/conf.d/ - certs:/etc/letsencrypt/ diff --git a/matrix/.env b/matrix/.env index 7a3db70..82840f5 100644 --- a/matrix/.env +++ b/matrix/.env @@ -5,6 +5,9 @@ POSTGRES_PASSWORD= PUID=1000 PGID=1000 +#SYNAPSE_ENABLE_REGISTRATION=yes +#SYNAPSE_ALLOW_GUEST=yes + SYNAPSE_REPORT_STATS=no POSTGRES_USER=matrix POSTGRES_DB=matrix diff --git a/matrix/compose.yaml b/matrix/compose.yaml index 6f306ce..90560be 100644 --- a/matrix/compose.yaml +++ b/matrix/compose.yaml @@ -24,7 +24,7 @@ services: - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C matrix: - image: docker.io/matrixdotorg/synapse:latest + image: docker.io/matrixdotorg/synapse:v1.97.0 restart: unless-stopped volumes: - config:/config/ @@ -33,11 +33,8 @@ services: - SYNAPSE_SERVER_NAME=$BASE_URL - SYNAPSE_CONFIG_DIR=/config - SYNAPSE_DATA_DIR=/data - - POSTGRES_HOST=db - UID=$PUID - GID=$PGID - env_file: - - .env networks: - nginx - default diff --git a/matrix/init_config.sh b/matrix/init_config.sh new file mode 100644 index 0000000..3a7a746 --- /dev/null +++ b/matrix/init_config.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env -S - bash -e + +set -a + . .env + SYNAPSE_SERVER_NAME="$BASE_URL" + SYNAPSE_NO_TLS=1 + POSTGRES_HOST=db +set +a + +ENV=() +while read -r LINE; do + ENV+=(-e "$LINE") +done < <(env) + +docker-compose run "${ENV[@]}" matrix migrate_config diff --git a/matrix/new_user.sh b/matrix/new_user.sh index f61e3d4..3e27b4b 100755 --- a/matrix/new_user.sh +++ b/matrix/new_user.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/bash -e -sudo docker-compose exec matrix register_new_matrix_user -c /config/homeserver.yaml +docker-compose exec -it matrix register_new_matrix_user -c /config/homeserver.yaml diff --git a/matrix/nginx.conf b/matrix/nginx.conf index 3d3e598..5f4401c 100644 --- a/matrix/nginx.conf +++ b/matrix/nginx.conf @@ -11,9 +11,9 @@ server { listen [::]:443 ssl; server_name $BASE_URL; -# # For the federation port -# listen 8448 ssl default_server; -# listen [::]:8448 ssl default_server; + # For the federation port + listen 8448 ssl default_server; + listen [::]:8448 ssl default_server; ssl_certificate /etc/letsencrypt/live/$BASE_URL/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/$BASE_URL/privkey.pem; diff --git a/nextcloud/nginx.conf b/nextcloud/nginx.conf index 454e379..7a68cee 100644 --- a/nextcloud/nginx.conf +++ b/nextcloud/nginx.conf @@ -14,7 +14,6 @@ server { ssl_certificate /etc/letsencrypt/live/$BASE_URL/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/$BASE_URL/privkey.pem; - location / { proxy_pass http://nextcloud;