MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-06-15 21:28:18 +02:00
Code Issues Releases Activity
1972 commits 50 branches 6 tags 12 MiB
Commit graph

1972 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo Kösters 08f0f17ff7 Merge branch 'msteenhagen-next-patch-18830' into 'next' 
Removed ambiguity in deploy.md

See merge request famedly/conduit!525
 2023-08-01 11:23:47 +00:00
Timo Kösters 57b86f1130 Merge branch 'msteenhagen-next-patch-22350' into 'next' 
Correct option error adduser in DEPLOY.md

See merge request famedly/conduit!526
 2023-08-01 11:23:28 +00:00
Maarten Steenhagen 3a6eee7019 Correct option error adduser in DEPLOY.md 2023-08-01 11:03:31 +00:00
Maarten Steenhagen 9ce1cad983 Changed 'right' to 'appropriate' to avoid ambiguity (original could be read as right-hand-side) 2023-08-01 10:58:07 +00:00
Timo Kösters 10da9485a5 Merge branch 'threads' into 'next' 
fix: threads get updated properly

See merge request famedly/conduit!524
 2023-07-31 14:24:11 +00:00
Timo Kösters acfe381dd3
fix: threads get updated properly 
Workaround for element web while waiting for https://github.com/matrix-org/matrix-js-sdk/pull/3635
 2023-07-31 16:18:23 +02:00
Timo Kösters afd8112e25 Merge branch 'spaces' into 'next' 
Automatic update checker

See merge request famedly/conduit!522
 2023-07-29 19:55:51 +00:00
Timo Kösters b8c164dc60
feat: version checker 2023-07-29 21:53:57 +02:00
Timo Kösters 0453a72890 Merge branch 'patch-1' into 'next' 
fix: s/ok_or/ok_or_else in relevant places

See merge request famedly/conduit!521
 2023-07-29 19:19:05 +00:00
girlbossceo e2c914cc11 fix: s/ok_or/ok_or_else in relevant places 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 19:17:12 +00:00
Timo Kösters da907451e7
Admin commands to sign and verify jsons 2023-07-29 20:00:12 +02:00
Timo Kösters 2b4a6c96ee Merge branch 'small-logging-improvements' into 'next' 
Slight logging improvements

See merge request famedly/conduit!517
 2023-07-29 15:00:42 +00:00
girlbossceo d7061e6984 cargo fmt 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:30:48 +00:00
girlbossceo 3494d7759e Return "Hello from Conduit!" on the / route 
akin to Synapes's "It works!" page, removing an unnecessary warning
about / route being unknown

Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo cc5dcceacc Log the room ID, event ID, PDU, and event type where possible 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo 863103450c Log the unknown login type in warning level 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo a0148a9996 Print relevant room ID and ACL'd server in informational level 
These are room ACLs, not server ACLs. Causes confusion where people
think their Conduit homeserver was ACL'd. Print where these are coming from
in informational level.

Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo 1f867a2c86 Only print raw malformed JSON body in debug level 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
Timo Kösters 97835541ce Merge branch 'uak-next-patch-77212' into 'next' 
Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md

See merge request famedly/conduit!514
 2023-07-29 07:13:58 +00:00
Timo Kösters 1e675dbb68 Merge branch 'next' into 'next' 
Docs: OCI image registries and tags

See merge request famedly/conduit!492
 2023-07-28 19:34:42 +00:00
Timo Kösters f4c1748ab1 Merge branch 'bugfix/well-known-missing' into 'next' 
It's ok not being able to find a .well-known response.

See merge request famedly/conduit!519
 2023-07-28 15:45:59 +00:00
Tobias Tom 7990822f72 It's ok not being able to find a .well-known response. 2023-07-28 16:26:40 +01:00
Timo Kösters 2a100412fa Merge branch 'relax-rocksdb' into 'next' 
relax recovery mode

See merge request famedly/conduit!516
 2023-07-27 06:12:31 +00:00
Timo Kösters 3e7652909b Merge branch 'maximize-fd-limit' into 'next' 
maximize fd limit

See merge request famedly/conduit!515
 2023-07-27 06:11:05 +00:00
Charles Hall 9fb8498067
relax recovery mode 2023-07-26 15:32:36 -07:00
Charles Hall 291290db92
maximize fd limit 2023-07-26 13:24:44 -07:00
uak 54a115caf3 Change link from docker-compose.override.traefik.yml to docker-compose.override.yml in README.md 2023-07-26 18:53:19 +00:00
Timo Kösters 81866170f0 Merge branch 'spaces' into 'next' 
fix: spaces with restricted rooms

See merge request famedly/conduit!513
 2023-07-26 06:40:00 +00:00
Timo Kösters bf46829595
fix: spaces with restricted rooms 2023-07-26 08:34:12 +02:00
Timo Kösters 9f14ad7125 Merge branch 'sync-up-debian-packaging' into 'next' 
Sync up Debian packaging

See merge request famedly/conduit!510
 2023-07-24 17:10:45 +00:00
Timo Kösters 90a10c84ef Merge branch 'slidingfixes' into 'next' 
Better sliding sync

See merge request famedly/conduit!511
 2023-07-24 08:48:27 +00:00
Timo Kösters d220641d64
Sliding sync subscriptions, e2ee, to_device messages 2023-07-24 10:42:52 +02:00
Timo Kösters caddc656fb
slightly better sliding sync 2023-07-24 10:42:47 +02:00
Paul van Tilburg b1a591a06c
Also create the conduit (system) group 
The `chown` command mentioned later in `DEPLOY.md` needs this group to
exist. Also make sure this account cannot be used to login with by
disabling its password and its shell.

This is similar to how the Debian `postinst` script does this.
 2023-07-23 12:53:43 +02:00
Paul van Tilburg 3cd3d0e0ff
Add section about how to download/install/deploy 
This refers to `DEPLOY.md` as to not duplicate the information.
 2023-07-23 12:53:36 +02:00
Paul van Tilburg 433dad6ac2
Turn README.Debian into a markdown file 
It is common to have a markdown file per deployment subdirectory.
Still install it as `README.Debian` to `/usr/share/doc/matrix-conduit`
as per Debian policy.

Also update the link in the main `README.md` file.
 2023-07-23 12:37:38 +02:00
Paul van Tilburg 8cf408e966
Fix up permissions of the database path 
Also apply the database creation and ownership change on every
installation and upgrade.
 2023-07-23 12:37:38 +02:00
Timo Kösters 1e560529d8 Merge branch 'nix-upkeep' into 'next' 
Nix upkeep

See merge request famedly/conduit!505
 2023-07-23 09:23:41 +00:00
Timo Kösters ff98444d03 Merge branch 'nogroup' into 'next' 
[Security fix] Create dedicated user group

See merge request famedly/conduit!509
 2023-07-23 09:22:39 +00:00
x4u 82f31d6b72 Replace nogroup with dedicated user group 2023-07-23 14:21:36 +08:00
Charles Hall 6ae5143ff5
only listen on IPv6 since that's what conduit does 2023-07-21 12:12:37 -07:00
purplemeteorite bd8fec3836 changed registry options 
1. Recommended GitLab's own registry over Docker Hub. (Reason: https://gitlab.com/famedly/conduit/-/merge_requests/492#note_1457220261)
2. Added the development image :next to the list of options.
3. Displayed text for Docker Hub now contains "docker.io" as part of the link for easier copy-paste for podman users. Clicking on the link still takes to the website.
 2023-07-21 20:33:32 +02:00
Charles Hall 742331e054
Revert "only use musl on x86_64" 
This reverts commit 56f0f3dfa4.

This shouldn't be needed anymore since [this][0] reached nixos-unstable.

[0]: https://github.com/NixOS/nixpkgs/pull/242889
 2023-07-16 13:48:05 -07:00
Charles Hall abd8e1bf54
nixpkgs' rocksdb is now new enough :) 
This reverts commit abd0a014e8.
 2023-07-16 13:47:42 -07:00
Charles Hall fa3b1fd9bd
update flake.lock 
Flake lock file updates:

• Updated input 'crane':
    'github:ipetkov/crane/75f7d715f8088f741be9981405f6444e2d49efdd' (2023-06-13)
  → 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
• Updated input 'crane/rust-overlay':
    'github:oxalica/rust-overlay/c535b4f3327910c96dcf21851bbdd074d0760290' (2023-06-03)
  → 'github:oxalica/rust-overlay/f9b92316727af9e6c7fee4a761242f7f46880329' (2023-07-03)
• Updated input 'fenix':
    'github:nix-community/fenix/df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791' (2023-06-17)
  → 'github:nix-community/fenix/39096fe3f379036ff4a5fa198950b8e79defe939' (2023-07-16)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6' (2023-06-16)
  → 'github:rust-lang/rust-analyzer/996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8' (2023-07-15)
• Updated input 'flake-utils':
    'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
  → 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/04af42f3b31dba0ef742d254456dc4c14eedac86' (2023-06-17)
  → 'github:NixOS/nixpkgs/8acef304efe70152463a6399f73e636bcc363813' (2023-07-15)
 2023-07-16 13:37:40 -07:00
Timo Kösters e9946f81a0 Merge branch 'e2eefed' into 'next' 
fix: e2ee over federation

See merge request famedly/conduit!504
 2023-07-16 14:54:44 +00:00
Timo Kösters a9ba067e77
fix: e2ee over federation 2023-07-16 16:50:03 +02:00
Timo Kösters 706148f941 Merge branch 'nhekobug' into 'next' 
fix: nheko e2ee verification bug

See merge request famedly/conduit!503
 2023-07-15 21:46:12 +00:00
Timo Kösters 24402312c5
fix: could not verify own events 2023-07-15 23:43:25 +02:00
Jonas Zohren 17180a3e08 capitalize names 2023-07-13 16:54:56 +00:00