From 5e3ae3771dfb5b1337e6b5d89201ffec8b8a1819 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 11 Jul 2022 12:53:33 -0700
Subject: [PATCH] ircd::m::homeserver: Fix database conf values overriding
 environmental values.

---
 matrix/homeserver.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/matrix/homeserver.cc b/matrix/homeserver.cc
index 63adf4ed3..6481ad6e4 100644
--- a/matrix/homeserver.cc
+++ b/matrix/homeserver.cc
@@ -809,6 +809,10 @@ try
 	if(conf::exists(key) && !conf::persists(key))
 		return false;
 
+	// Conf items set by environment variables take precedence over db values.
+	if(conf::environ(key))
+		return false;
+
 	log::debug
 	{
 		"Updating conf [%s] => [%s]", key, value