From dba528a5e011e6f09c144efd95ad6ceaa77079e0 Mon Sep 17 00:00:00 2001
From: lafleur <lafleur@boum.org>
Date: Tue, 6 May 2025 10:48:53 +0200
Subject: [PATCH] rebase on current main

---
 conduwuit-example.toml  | 6 +++++-
 src/service/services.rs | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/conduwuit-example.toml b/conduwuit-example.toml
index 4659aeba4..44af38cf0 100644
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
@@ -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.
diff --git a/src/service/services.rs b/src/service/services.rs
index 92c56a79c..bde8297b7 100644
--- a/src/service/services.rs
+++ b/src/service/services.rs
@@ -13,7 +13,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 {
@@ -39,6 +39,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>,