Skip to content

Commit 0ef4dd9

Browse files
committed
Ammend config not to clash with existing CI
this means that the appsrvice bot is now called 'mjolnir-bot' by default which was easier than going through old code base and renaming
1 parent ee1acc8 commit 0ef4dd9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

mx-tester.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: mjolnir
22

33
up:
44
before:
5-
- docker run --rm --network $MX_TEST_NETWORK_NAME --name mjolnir-test-postgres --domainname mjolnir-test-postgres -e POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8082:5432 postgres
5+
- docker run --rm --network $MX_TEST_NETWORK_NAME --name mjolnir-test-postgres --domainname mjolnir-test-postgres -e POSTGRES_PASSWORD=mjolnir-test -e POSTGRES_USER=mjolnir-tester -e POSTGRES_DB=mjolnir-test-db -d -p 127.0.0.1:8083:5432 postgres
66
# Wait until postgresql is ready
7-
- until psql postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
7+
- until psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
88
# Make table in postgres
9-
- psql postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db -c "CREATE TABLE mjolnir (local_part VARCHAR(255), owner VARCHAR(255), management_room TEXT)"
9+
- psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c "CREATE TABLE mjolnir (local_part VARCHAR(255), owner VARCHAR(255), management_room TEXT)"
1010
# Launch the reverse proxy, listening for connections *only* on the local host.
1111
- docker run --rm --network host --name mjolnir-test-reverse-proxy -p 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
1212
- yarn install

src/appservice/AppService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class MjolnirAppService {
9999
reg.setId(AppServiceRegistration.generateToken());
100100
reg.setHomeserverToken(AppServiceRegistration.generateToken());
101101
reg.setAppServiceToken(AppServiceRegistration.generateToken());
102-
reg.setSenderLocalpart("mjolnir");
102+
reg.setSenderLocalpart("mjolnir-bot");
103103
reg.addRegexPattern("users", "@mjolnir_.*", true);
104104
reg.setRateLimited(false);
105105
callback(reg);

src/appservice/config/config.harness.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ homeserver:
55

66
db:
77
engine: "postgres"
8-
connectionString: "postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db"
8+
connectionString: "postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db"
99

1010
accessControlList: "#access-control-list:localhost:9999"
1111

0 commit comments

Comments
 (0)