rebase on current main

This commit is contained in:
lafleur 2025-05-06 10:48:53 +02:00 committed by nexy7574
parent eb4c6f9d13
commit 3417ac2487
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
2 changed files with 7 additions and 2 deletions

View file

@ -58,7 +58,11 @@
#
#port = 8008
# The UNIX socket continuwuity will listen on.
# This item is undocumented. Please contribute documentation for it.
#
#auth =
# The UNIX socket conduwuit will listen on.
#
# continuwuity cannot listen on both an IP address and a UNIX socket. If
# listening on a UNIX socket, you MUST remove/comment the `address` key.

View file

@ -15,7 +15,7 @@ use crate::{
manager::Manager,
media, moderation, presence, pusher, resolver, rooms, sending, server_keys, service,
service::{Args, Map, Service},
sync, transaction_ids, uiaa, users,
sync, transaction_ids, uiaa, users, oidc,
};
pub struct Services {
@ -41,6 +41,7 @@ pub struct Services {
pub users: Arc<users::Service>,
pub moderation: Arc<moderation::Service>,
pub announcements: Arc<announcements::Service>,
pub oidc: Arc<oidc::Service>,
manager: Mutex<Option<Arc<Manager>>>,
pub(crate) service: Arc<Map>,