Matrix-Mirrors/mjolnir
1
0
Fork 0
mirror of https://github.com/matrix-org/mjolnir.git synced 2024-10-01 05:36:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ammend config not to clash with existing CI

Browse Source 
this means that the appsrvice bot is now called 'mjolnir-bot' by default
which was easier than going through old code base and renaming
This commit is contained in:
gnuxie 2022-10-24 11:16:29 +01:00
parent 6d048076bf
commit ab4655fdcb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mx-tester.yml
View File

@ -2,11 +2,11 @@ name: mjolnir
up: up:
before: before:
- 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 - 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
# Wait until postgresql is ready # Wait until postgresql is ready
- until psql postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done - until psql postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db -c ""; do echo "Waiting for psql..."; sleep 1s; done
# Make table in postgres # Make table in postgres
- 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)" - 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)"
# Launch the reverse proxy, listening for connections *only* on the local host. # 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: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 -p 127.0.0.1:8081:80 -v $MX_TEST_CWD/test/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
- yarn install - yarn install

2
src/appservice/AppService.ts
View File

@ -99,7 +99,7 @@ export class MjolnirAppService {
reg.setId(AppServiceRegistration.generateToken()); reg.setId(AppServiceRegistration.generateToken());
reg.setHomeserverToken(AppServiceRegistration.generateToken()); reg.setHomeserverToken(AppServiceRegistration.generateToken());
reg.setAppServiceToken(AppServiceRegistration.generateToken()); reg.setAppServiceToken(AppServiceRegistration.generateToken());
reg.setSenderLocalpart("mjolnir"); reg.setSenderLocalpart("mjolnir-bot");
reg.addRegexPattern("users", "@mjolnir_.*", true); reg.addRegexPattern("users", "@mjolnir_.*", true);
reg.setRateLimited(false); reg.setRateLimited(false);
callback(reg); callback(reg);

2
src/appservice/config/config.harness.yaml
View File

@ -5,7 +5,7 @@ homeserver:
db: db:
engine: "postgres" engine: "postgres"
connectionString: "postgres://mjolnir-tester:mjolnir-test@localhost:8082/mjolnir-test-db" connectionString: "postgres://mjolnir-tester:mjolnir-test@localhost:8083/mjolnir-test-db"
accessControlList: "#access-control-list:localhost:9999" accessControlList: "#access-control-list:localhost:9999"