From 256fbc6ea5f5a8561fcde6645f61e76d4ef40806 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Tue, 6 May 2025 22:56:23 +0100
Subject: [PATCH] chore: Add CONTINUWUITY_ environment variables

Also updates some examples to match
---
 debian/conduwuit.service | 7 ++++---
 src/core/config/mod.rs   | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/conduwuit.service b/debian/conduwuit.service
index 3d2fbc9b..be2f3dae 100644
--- a/debian/conduwuit.service
+++ b/debian/conduwuit.service
@@ -1,9 +1,10 @@
 [Unit]
-Description=conduwuit Matrix homeserver
+
+Description=Continuwuity - Matrix homeserver
 Wants=network-online.target
 After=network-online.target
-Alias=matrix-conduwuit.service
 Documentation=https://continuwuity.org/
+Alias=matrix-conduwuit.service
 
 [Service]
 DynamicUser=yes
@@ -11,7 +12,7 @@ User=conduwuit
 Group=conduwuit
 Type=notify
 
-Environment="CONDUWUIT_CONFIG=/etc/conduwuit/conduwuit.toml"
+Environment="CONTINUWUITY_CONFIG=/etc/conduwuit/conduwuit.toml"
 
 ExecStart=/usr/sbin/conduwuit
 
diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs
index 5374c2c2..5648a126 100644
--- a/src/core/config/mod.rs
+++ b/src/core/config/mod.rs
@@ -1962,7 +1962,11 @@ impl Config {
 	where
 		I: Iterator<Item = &'a Path>,
 	{
-		let envs = [Env::var("CONDUIT_CONFIG"), Env::var("CONDUWUIT_CONFIG")];
+		let envs = [
+			Env::var("CONDUIT_CONFIG"),
+			Env::var("CONDUWUIT_CONFIG"),
+			Env::var("CONTINUWUITY_CONFIG"),
+		];
 
 		let config = envs
 			.into_iter()
@@ -1971,7 +1975,8 @@ impl Config {
 			.chain(paths.map(Toml::file))
 			.fold(Figment::new(), |config, file| config.merge(file.nested()))
 			.merge(Env::prefixed("CONDUIT_").global().split("__"))
-			.merge(Env::prefixed("CONDUWUIT_").global().split("__"));
+			.merge(Env::prefixed("CONDUWUIT_").global().split("__"))
+			.merge(Env::prefixed("CONTINUWUITY_").global().split("__"));
 
 		Ok(config)
 	}