From 679cb635518d1a3610a1b2d990e00a10572085de Mon Sep 17 00:00:00 2001 From: root Date: Tue, 20 Feb 2024 20:31:40 +0000 Subject: [PATCH] Switched convertmmrimport back to HOSTNAME config --- bin/convertmmrimport | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/convertmmrimport b/bin/convertmmrimport index fecae07..15977c0 100755 --- a/bin/convertmmrimport +++ b/bin/convertmmrimport @@ -59,7 +59,7 @@ chmod 644 /federated/apps/matrix/data/matrix/$DOMAIN.crt /federated/apps/matrix/ chown -R 991:991 /federated/apps/matrix/data/matrix # Generate the matrix homeserver.yaml file -docker run --rm -v "/federated/apps/matrix/data/matrix:/data" -e SYNAPSE_SERVER_NAME=matrix.$DOMAIN -e SYNAPSE_REPORT_STATS=yes matrixdotorg/synapse:latest generate &> /dev/null +docker run --rm -v "/federated/apps/matrix/data/matrix:/data" -e SYNAPSE_SERVER_NAME=$HOSTNAME -e SYNAPSE_REPORT_STATS=yes matrixdotorg/synapse:latest generate &> /dev/null [ $? -ne 0 ] && fail "Couldn't run docker matrixdotorg/synapse:latest generate" # Take out default Sqlite database config @@ -148,7 +148,7 @@ unzip -jo /federated/tmp/$HOSTNAME-media-$HOSTNAME.zip -d /federated/tmp/matrixm [ $? -ne 0 ] && failcheck "Couldn't unzip media files into tmp/matrixmedia" # run the matrix-media-repo:latest image and convert / import the media into our matrix server DB -docker run -v /federated/tmp/matrixmedia:/export --network=federated --rm turt2live/matrix-media-repo:latest /usr/local/bin/import_to_synapse -dbHost 172.99.0.14 -dbName matrix -dbUsername matrix -debug -directory /export -serverName matrix.$DOMAIN -dbPassword $MATRIX_SECRET +docker run -v /federated/tmp/matrixmedia:/export --network=federated --rm turt2live/matrix-media-repo:latest /usr/local/bin/import_to_synapse -dbHost 172.99.0.14 -dbName matrix -dbUsername matrix -debug -directory /export -serverName $HOSTNAME -dbPassword $MATRIX_SECRET # Start matrix back up /federated/bin/start matrix