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
Torsten Flammiger
eecd664c43
Reformat code
2022-01-13 12:26:23 +01: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
Jonas Platte
bcf4ede0bc
Restore compatibility with Rust 1.53
2022-01-13 12:06:20 +01: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
Jonas Platte
84862352ba
Replace to_string calls on string literals with to_owned
2022-01-13 11:48:40 +01:00
Jonas Platte
cf54185a1c
Use struct literals for consistency
2022-01-13 11:48:18 +01:00
Jonas Platte
349865d3cc
Upgrade Ruma
2022-01-13 11:44:23 +01: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
Ticho 34782694
b746f17e56
Make traefik+nginx config more self-contained
...
The nginx instance which is serving the .well-known endpoints can serve
the simple JSON replies directly from memory, instead of having them
as external files on disk.
2022-01-07 13:06:21 +00:00
Torsten Flammiger
8d51359668
Fix typo and remove unneeded newline
2021-12-26 20:49:19 +01:00
Torsten Flammiger
a69eb277d4
Update count users: It's now list_local_users and contains the number and the usernames
2021-12-26 20:00:31 +01:00
Torsten Flammiger
39787b41cb
Rename admin command CountUsers -> CountLocalUsers; Update comments
2021-12-26 12:04:38 +01:00
Torsten Flammiger
2281bcefc6
Finalize count_local_users function
2021-12-26 11:06:28 +01:00
Torsten Flammiger
d21030566c
Rename/Add count methods to count_local_users
2021-12-25 21:29:03 +01:00
Torsten Flammiger
567cf6dbe9
Add command count_local_users to database/rooms.rs
2021-12-25 20:51:22 +01:00
Torsten Flammiger
7c1b2625cf
Prepare to add an option to list local user accounts from your homeserver
2021-12-24 23:06:54 +01:00
Tglman
a889e884e6
refactor:moved key watch wake logic to specific module
2021-12-23 23:17:43 +00:00
Jonas Platte
aba95b20f3
Upgrade Ruma
2021-12-23 17:40:42 +01:00
Moritz Bitsch
c4a438460e
Use Box to store UserID and DeviceID
...
Userid and DeviceID are of unknown size, use Box to be able to store
them into the userdevicesessionid_uiaarequest BTreeMap
2021-12-22 19:26:23 +01:00
Torsten Flammiger
7f2445be6c
On unregister_appservice(service_name), remove the appservice service_name from cache too
2021-12-22 16:48:27 +01:00
Torsten Flammiger
b6c9582cf4
Fix doc style comment according to Rust; VSCode added line breaks
2021-12-22 13:09:56 +01:00
Torsten Flammiger
7857da8a0b
Add ability to remove an appservice
2021-12-20 15:46:36 +01:00
Moritz Bitsch
720a54b3bb
Use String to store UserId for uiaa request
...
Fixes compilation error after ruma upgrade
2021-12-18 19:05:18 +01:00
Moritz Bitsch
0725b69abb
Clean up userdevicesessionid_uiaarequest BTreeMap
...
There is no need to encode or decode anything as we are not
saving to disk
2021-12-18 18:57:36 +01:00
Moritz Bitsch
fe8cfe0556
Add database migration to remove stored passwords
...
uiaarequests can contain plaintext passwords, which were stored on disk
2021-12-18 18:57:36 +01:00
Moritz Bitsch
3d25d46dc5
Use simple BTreeMap to store uiaa requests
...
some uiaa requests contain plaintext passwords which should never be
persisted to disk.
Currently there is no cleanup implemented (you have to restart conduit)
2021-12-18 18:57:36 +01: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
Jonas Platte
34d3f74f36
Use Arc for EventIds in PDUs
...
Upgrades Ruma again to make this work.
2021-12-16 13:55:24 +01: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
Jonas Platte
0183d003d0
Revert rename of Ruma<_> parameters
2021-12-15 13:58:25 +01:00
Jonas Platte
f712455047
Reduce EventId copying
2021-12-15 13:00:37 +01:00
Jonas Platte
58ea081762
Use int! macro instead of Int::from
2021-12-15 13:00:37 +01:00
Jonas Platte
bffddbd487
Simplify identifier parsing code
2021-12-15 13:00:37 +01:00
Jonas Platte
41fef1da64
Remove unnecessary .to_string() calls
2021-12-15 13:00:37 +01:00
Jonas Platte
892a0525f2
Upgrade Ruma
2021-12-15 13:00:37 +01:00
Jonas Platte
1fc616320a
Use struct init shorthand
2021-12-15 13:00:37 +01: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
Jonas Zohren
339a26f56c
Update docker images
2021-12-15 10:14:20 +00:00
Jonas Zohren
adb518fa0d
CI: Use curl instead of wget
...
The rust docker image already comes with curl, no need to install wget.
2021-12-14 11:16:40 +01:00
Jonas Zohren
f91216dd3c
CI: Optionally use sccache for compilation
...
This moves compiler caching for incremental builds away from GitLab
caching the whole target/ folder to caching each code unit in S3.
This aleviates the need to zip and unzip and just caches on the fly.
This feature is optional and gated behind the SCCACHE_BIN_URL env
2021-12-14 11:16:02 +01: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
Jonas Zohren
9bfc7b34b6
Fixes for !225
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
Jonas Zohren
2fff720df3
CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab
2021-11-21 17:34:08 +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
