From 97fcdb9a0b135848529f616083f884a5f0d50ba9 Mon Sep 17 00:00:00 2001
From: MTRNord <mtrnord1@gmail.com>
Date: Tue, 24 Oct 2023 11:43:33 +0200
Subject: [PATCH] Use ports that are further away

---
 mx-tester.yml   | 2 +-
 test/nginx.conf | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mx-tester.yml b/mx-tester.yml
index bccaec3d..1e903e89 100644
--- a/mx-tester.yml
+++ b/mx-tester.yml
@@ -6,7 +6,7 @@ up:
     # Wait until postgresql is ready
     - until psql postgres://mjolnir-tester:mjolnir-test@127.0.0.1:8083/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
     # Launch the reverse proxy, listening for connections *only* on the local host.
-    - docker run --rm --network host --name mjolnir-test-reverse-proxy -p 127.0.0.1:8084:8084 -p 127.0.0.1:8085:8085 -p 127.0.0.1:8086:8086 -p 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
+    - docker run --rm --network host --name mjolnir-test-reverse-proxy -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
     - yarn install
     - npx ts-node src/appservice/cli.ts -r -u "http://host.docker.internal:9000"
     - cp mjolnir-registration.yaml $MX_TEST_SYNAPSE_DIR/data/
diff --git a/test/nginx.conf b/test/nginx.conf
index 9892e443..943d8e84 100644
--- a/test/nginx.conf
+++ b/test/nginx.conf
@@ -6,7 +6,7 @@ http {
     server {
         listen [::]:8081 ipv6only=off;
 
-        location ~ ^/_matrix/client/(r0|v3)/rooms/([^/]*)/report/(.*)$ {
+        location ~ ^/_matrix/client/(r0|v3)/rooms/([^/\s]*)/report/(.*)$ {
             # Abuse reports should be sent to Mjölnir.
             # The r0 endpoint is deprecated but still used by many clients.
             # As of this writing, the v3 endpoint is the up-to-date version.
@@ -41,7 +41,7 @@ http {
         }
     }
     server {
-        listen [::]:8084 ipv6only=off;
+        listen [::]:7070 ipv6only=off;
 
         # MSC1929 Test in worst-case
         location /.well-known/matrix/support {
@@ -50,7 +50,7 @@ http {
         }
     }
     server {
-        listen [::]:8085 ipv6only=off;
+        listen [::]:7071 ipv6only=off;
 
         # MSC1929 Test in supportpage_only-case
         location /.well-known/matrix/support {
@@ -61,7 +61,7 @@ http {
         }
     }
     server {
-        listen [::]:8086 ipv6only=off;
+        listen [::]:7072 ipv6only=off;
 
         # MSC1929 Test in contacts-case
         location /.well-known/matrix/support {