Commit Graph
100 Commits
Author SHA1 Message Date
Timo Kösters 20006c91af Merge branch 'media-download-followup' into 'next'
Media download followup

See merge request famedly/conduit!271
2022-01-27 16:24:15 +00:00
Timo Kösters f7148def90 Merge branch 'up-ruma' into 'next'
Upgrade Ruma

See merge request famedly/conduit!268
2022-01-27 15:46:00 +00:00
Timo Kösters 63309e52f8 Merge branch 'media-download-with-filename' into 'next'
Media download with filename

See merge request famedly/conduit!266
2022-01-27 15:44:56 +00:00
Timo Kösters f50bdb6010 Merge branch 'list_local_users' into 'next'
Implement list_local_users command

See merge request famedly/conduit!260
2022-01-22 09:33:32 +00:00
Timo Kösters b634f9d45c Merge branch 'reqwestfix' into 'next'
improvement: use jemalloc for lower memory usage

See merge request famedly/conduit!262
2022-01-21 16:54:35 +00:00
Timo Kösters f88523988e improvement: use jemalloc for lower memory usage 2022-01-21 17:54:05 +01:00
Timo Kösters 4ef995cf7d Merge branch 'next' into 'next'
Add heisenbridge to tested appservices

See merge request famedly/conduit!250
2022-01-21 15:43:40 +00:00
Timo Kösters 58da67e59e Merge branch 'mautrix-signal-support' into 'next'
Add mautrix-signal to tested appservices

See merge request famedly/conduit!251
2022-01-21 15:33:10 +00:00
Timo Kösters 5d3ba5c628 Merge branch 'WIP_persy_batch_next' into 'next'
feat: Integration with persy using background ops

See merge request famedly/conduit!231
2022-01-21 15:31:46 +00:00
Timo Kösters ab4f3bd06c Merge branch 'lib-main' into 'next'
Clean up mod and use statements in lib.rs and main.rs

See merge request famedly/conduit!258
2022-01-20 12:32:39 +00:00
Timo Kösters cc0f094ff7 Merge branch 'rocksdbbreaks' into 'next'
Rocksdb breaking change. If your server breaks, come to #conduit:fachschaften.org

See merge request famedly/conduit!259
2022-01-19 06:17:57 +00:00
Timo Kösters d4eb3e3295 fix: rocksdb does not use zstd compression unless we disable everything else 2022-01-19 07:09:25 +01:00
Timo Kösters b2ffc4e496 Merge branch 'maxopenfiles' into 'next'
Server ACL support and more config options

Closes #67

See merge request famedly/conduit!248
2022-01-18 09:05:57 +00:00
Timo Kösters 53de350908 fix: less load when lazy loading 2022-01-17 23:24:27 +01:00
Timo Kösters 03b174335c improvement: lower default pdu cache capacity 2022-01-17 14:46:53 +01:00
Timo Kösters 8c90e7adfb refactor: fix warnings 2022-01-17 14:46:03 +01:00
Timo Kösters ee8e72f7a8 feat: implement server ACLs 2022-01-17 14:35:38 +01:00
Timo Kösters d434dfb3a5 feat: config option for rocksdb max open files 2022-01-14 11:44:20 +01:00
Timo Kösters 5b8d2a736e Merge branch 'default' into 'next'
improvement: better default cache capacity

See merge request famedly/conduit!247
2022-01-14 10:44:06 +00:00
Timo Kösters 80e51986c4 improvement: better default cache capacity 2022-01-14 11:08:31 +01:00
Timo Kösters 1119c2f510 Merge branch 'rocksdb' into 'next'
feat: rocksdb backend

See merge request famedly/conduit!217
2022-01-13 22:12:51 +00:00
Timo Kösters 16f826773b refactor: fix warnings 2022-01-13 22:55:35 +01:00
Timo Kösters 6fa01aa982 fix: remove dbg 2022-01-13 22:44:27 +01:00
Timo Kösters a336027b0e fix: better memory usage message 2022-01-13 22:44:27 +01:00
Timo Kösters 447639054e improvement: higher default pdu capacity 2022-01-13 22:44:27 +01:00
Timo Kösters 9e77f7617c fix: disable direct IO again 2022-01-13 22:44:27 +01:00
Timo Kösters 7f27af032b improvement: optimize rocksdb for spinning disks 2022-01-13 22:44:26 +01:00
Timo Kösters b96822b617 fix: use db options for column families too 2022-01-13 22:44:26 +01:00
Timo Kösters 0bb7d76dec improvement: rocksdb configuration 2022-01-13 22:44:26 +01:00
Timo Kösters 077e9ad438 improvement: memory usage for caches 2022-01-13 22:44:25 +01:00
Timo Kösters fa6d7f7ccd feat: database backend selection at runtime 2022-01-13 22:42:22 +01:00
Timo Kösters 4f39d36e98 docs: lazy loading 2022-01-13 22:38:52 +01:00
Timo Kösters c6d88359d7 fix: incremental lazy loading 2022-01-13 22:38:52 +01:00
Timo Kösters f285c89006 fix: make incremental sync efficient again 2022-01-13 22:38:52 +01:00
Timo Kösters 93d225fd1e improvement: faster way to load required state 2022-01-13 22:38:52 +01:00
Timo Kösters 1bd9fd74b3 feat: partially support sync filters 2022-01-13 22:38:52 +01:00
Timo Kösters 68e910bb77 feat: lazy loading 2022-01-13 22:38:50 +01:00
Timo Kösters 5bcc1324ed fix: auth event fetch order 2022-01-13 22:29:19 +01:00
Timo Kösters 54f4d39e3e improvement: don't fetch event multiple times 2022-01-13 22:29:17 +01:00
Timo Kösters b1d9ec3efc fix: atomic increment 2022-01-13 22:28:18 +01:00
Timo Kösters ee3d2db8e0 improvement, maybe not safe 2022-01-13 22:10:51 +01:00
Timo Kösters 83a9095cdc fix? 2022-01-13 22:10:51 +01:00
Timo Kösters 74951cb239 dbg 2022-01-13 22:10:51 +01:00
Timo Kösters 4b4afea2ab fix auth event fetching 2022-01-13 22:10:51 +01:00
Timo Kösters c9c9974641 fix: stack overflows when fetching auth events 2022-01-13 22:10:50 +01:00
Timo Kösters a30b588ede rocksdb as default 2022-01-13 22:10:50 +01:00
Timo Kösters 1d647a1a9a improvement: allow rocksdb again 2022-01-13 22:10:43 +01:00
Timo Kösters b25354c747 Merge branch 'add_remove_appservice' into 'next'
Add ability to remove an appservice

See merge request famedly/conduit!236
2022-01-13 11:38:17 +00:00
Timo Kösters f3ea2df9fe Merge branch 'simpler-traefik-nginx' into 'next'
Make traefik+nginx config more self-contained

See merge request famedly/conduit!239
2022-01-13 11:18:15 +00:00
Timo Kösters fbcbadf265 Merge branch 'rust-1.53' into 'next'
Restore compatibility with Rust 1.53

See merge request famedly/conduit!244
2022-01-13 11:09:14 +00:00
Timo Kösters f5d1dda766 Merge branch 'up-ruma' into 'next'
Upgrade Ruma

See merge request famedly/conduit!243
2022-01-13 10:52:13 +00:00
Timo Kösters 2fa8171e79 Merge branch 'ci-use-sccache' into 'next'
CI: Use sccache for caching

Closes #200

See merge request famedly/conduit!232
2022-01-13 10:42:33 +00:00
Timo Kösters 8e12b47df4 Merge branch 'no-passwords-in-db' into 'next'
Do not store uiaa requests in database

See merge request famedly/conduit!219
2022-01-13 10:33:49 +00:00
Timo Kösters 0ec26b7e96 Merge branch 'next' into 'next'
refactor:moved key watch wake logic to specific module

See merge request famedly/conduit!238
2022-01-13 10:27:56 +00:00
Timo Kösters b32e85ffa8 Merge branch 'up-ruma' into 'next'
Upgrade Ruma

See merge request famedly/conduit!237
2022-01-13 10:24:45 +00:00
Timo Kösters 9b57c89df6 Merge branch 'more-event-id-arcs' into 'next'
Use Arc for EventIds in PDUs

See merge request famedly/conduit!229
2021-12-16 13:06:30 +00:00
Timo Kösters 11a21fc136 Merge branch 'up-ruma' into 'next'
Upgrade ruma

See merge request famedly/conduit!228
2021-12-15 14:22:30 +00:00
Timo Kösters 14a178d783 Merge branch 'update-docker-base-image' into 'next'
Update docker images

See merge request famedly/conduit!230
2021-12-15 10:14:20 +00:00
Timo Kösters ca724b6340 Merge branch '226-fix-docker-ci-issues' into 'next'
Fixes for !225

See merge request famedly/conduit!226
2021-11-25 22:36:44 +00:00
Timo Kösters afa5d449c6 Merge branch 'better-multiarch-building-the-second-attempt' into 'next'
CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab

Closes #145

See merge request famedly/conduit!225
2021-11-21 17:34:09 +00:00
Timo Kösters da00f611e9 Merge branch 'feature/turn-server-settings' into 'next'
Implement turn server settings

Closes #97

See merge request famedly/conduit!208
2021-11-19 16:39:24 +00:00
Timo Kösters 2a749c1e99 Merge branch 'nyaaori/implement-report' into 'next'
Implement the report feature

Closes #13

See merge request famedly/conduit!218
2021-11-03 14:17:32 +00:00
Timo Kösters 5ae753b2e7 Merge branch 'amorgan-next-patch-81816' into 'next'
Add 'Federation publicRoom Name/topic keys are correct' test to sytest whitelist

See merge request famedly/conduit!221
2021-10-27 11:49:55 +00:00
Timo Kösters 6f70beb78c Merge branch 'nyaaori/fix-bad-json' into 'next'
Nyaaori/fix bad json

Closes #115

See merge request famedly/conduit!216
2021-10-16 06:59:34 +00:00
Timo Kösters 259fc580ca Merge branch 'nyaaori/otk-sync-fix' into 'next'
Remove device_one_time_keys_count from is_empty() sync checks, fixing sync issue as reported by Nekron

Closes #115

See merge request famedly/conduit!215
2021-10-16 06:54:14 +00:00
Timo Kösters e88929e154 Merge branch 'nyaaori/fix-otk-reporting' into 'next'
Always send device_one_time_keys_count, fixing #178

Closes #169 and #178

See merge request famedly/conduit!213
2021-10-15 13:01:52 +00:00
Timo Kösters dc8bc4a880 Merge branch 'up-ruma' into 'next'
Upgrade Ruma

See merge request famedly/conduit!210
2021-10-15 11:38:12 +00:00
Timo Kösters 87694f4369 Merge branch 'moa31-next-patch-76037' into 'next'
Change listen address when running inside a Container to prevent Bad Gateway error

See merge request famedly/conduit!207
2021-10-15 10:51:19 +00:00
Timo Kösters 335027e739 Merge branch 'nyaaori/admin-check' into 'next'
Implement admin check and add config option for allowing room creation

See merge request famedly/conduit!211
2021-10-15 10:47:55 +00:00
Timo Kösters 0ccda5f1c7 Merge branch 'nyaaori/allow_encryption' into 'next'
Make allow_encryption work again, fixing #115

Closes #115

See merge request famedly/conduit!212
2021-10-15 10:20:05 +00:00
Timo Kösters 47f3263396 Merge branch 'gwmngilfen-next-patch-21674' into 'next'
Add two flavours of change for the mautrix-signal patch

See merge request famedly/conduit!197
2021-09-15 20:31:21 +00:00
Timo Kösters 34fa7fee05 Merge branch 'ci-fix-kaniko-i-hope' into 'next'
fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.

See merge request famedly/conduit!205
2021-09-15 07:05:33 +00:00
Timo Kösters 565fe3a7dd Merge branch 'faster-sending' into 'next'
improvement: batch inserts for inserting pdus

See merge request famedly/conduit!204
2021-09-14 18:35:12 +00:00
Timo Kösters 5c02dc7830 improvement: batch inserts for inserting pdus 2021-09-14 14:33:46 +02:00
Timo Kösters 159e22e450 Merge branch 'ci-fix-aarch64-build' into 'next'
fix(ci): Fix aarch64 build

See merge request famedly/conduit!203
2021-09-14 12:09:44 +00:00
Timo Kösters 31264e3d1d Merge branch 'ci-remove-element-web-register-test' into 'next'
Remove the "register an account with element" test

See merge request famedly/conduit!202
2021-09-14 09:50:24 +00:00
Timo Kösters b64538c6f1 Merge branch 'efficient-sqlite' into 'next'
improvement: more efficient sqlite

See merge request famedly/conduit!199
2021-09-14 07:23:02 +00:00
Timo Kösters 178451e9b5 Merge branch 'deduplicate-watchers' into 'next'
improvement: deduplicate watchers

See merge request famedly/conduit!201
2021-09-14 07:10:59 +00:00
Timo Kösters 583a966f6e Merge branch 'less-alloc' into 'next'
Reduce allocations in server_server

See merge request famedly/conduit!190
2021-09-14 07:09:55 +00:00
Timo Kösters cbee7fe111 improvement: deduplicate watchers 2021-09-13 23:20:30 +02:00
Timo Kösters 2c8412fe58 improvement: more efficient sqlite 2021-09-13 20:12:42 +02:00
Timo Kösters 06b0c9267f Merge branch 'appservice-signal' into 'next'
Add mautrix-signal appservice instructions

See merge request famedly/conduit!196
2021-09-13 14:07:18 +00:00
Timo Kösters 4aacafc298 Merge branch 'roomidshort-fix' into 'next'
fix sync not firing on new events in room

See merge request famedly/conduit!194
2021-09-08 13:39:05 +00:00
Timo Kösters 562a2524d7 Merge branch 'db-errors' into 'next'
fix(database): handle errors in config parsin or database creation

Closes #121

See merge request famedly/conduit!193
2021-09-08 09:53:25 +00:00
Timo Kösters 4a773a1096 Merge branch 'rm-unused-deps' into 'next'
Remove unused dependencies

See merge request famedly/conduit!192
2021-09-07 14:00:27 +00:00
Timo Kösters 0737bc021f Merge branch 'charludo-next-patch-31617' into 'next'
apache2 sample-config error

See merge request famedly/conduit!191
2021-09-06 18:38:38 +00:00
Timo Kösters 2d242523fc Merge branch 'next' into 'next'
Fix deprecated/removed Traefik label

See merge request famedly/conduit!189
2021-09-03 20:56:21 +00:00
Timo Kösters a449b1d73f Merge branch 'fix-old-events' into 'next'
fix: make sure old events don't sneek into the timeline

See merge request famedly/conduit!188
2021-09-03 09:47:24 +00:00
Timo Kösters 71341ea05a fix: make sure old events don't sneek into the timeline 2021-09-03 11:26:15 +02:00
Timo Kösters 73b764322f Merge branch 'adjust-ci-for-next-and-master-development' into 'master'
CI: Adjust CI for master and next branch development model (master)

See merge request famedly/conduit!187
2021-09-02 18:25:57 +00:00
Timo Kösters 0d6ae2e1e7 Merge branch 'thanks' into 'master'
docs: add thanks to

See merge request famedly/conduit!185
2021-09-02 11:10:23 +00:00
Timo Kösters d0baca44f8 docs: add thanks to 2021-09-02 13:05:19 +02:00
Timo Kösters 5536bfdca5 Merge branch 'ci-also-run-for-tags' into 'master'
Also run CI on git tags, not only new commits.

See merge request famedly/conduit!184
2021-09-02 07:33:25 +00:00
Timo Kösters 102ff574ea Merge branch 'readme' into 'master'
docs: update readme and version

See merge request famedly/conduit!180
2021-09-01 21:28:28 +00:00
Timo Kösters 2770ce2cf6 fix: avoid panic 2021-09-01 23:00:24 +02:00
Timo Kösters 7cd7f1923f chore: update dependencies 2021-09-01 22:31:25 +02:00
Timo Kösters 43d693ca19 revert Arc<EventId> commit 2021-09-01 22:30:11 +02:00
Timo Kösters 875b345a5f docs: update readme and version 2021-09-01 22:18:19 +02:00
Timo Kösters 17adf096e9 Merge branch 'server-server-opt' into 'master'
Remove unneeded intermediary container collection

See merge request famedly/conduit!183
2021-09-01 20:02:37 +00:00
Timo Kösters 27788af022 Merge branch 'batch_keys' into 'master'
Get required keys in batch when joining a room

See merge request famedly/conduit!182
2021-09-01 19:12:21 +00:00