From 79c16d1b9fa7d1eee09ae2febfeb1db85aaca08c Mon Sep 17 00:00:00 2001
From: Catalan Lover <catalanlover@protonmail.com>
Date: Wed, 29 Apr 2026 15:23:30 +0200
Subject: [PATCH] Refine ZTD Branch by removing leftover config values.

---
 .changeset/ready-jokes-melt.md                                | 4 ++--
 apps/draupnir/src/appservice/config/config.example.yaml       | 3 ---
 apps/draupnir/src/appservice/config/config.harness.yaml       | 4 ----
 apps/draupnir/src/appservice/config/config.ts                 | 3 ---
 .../test/appservice/integration/managedBootstrapStartTest.ts  | 1 -
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.changeset/ready-jokes-melt.md b/.changeset/ready-jokes-melt.md
index edc1ee6f..071c8e46 100644
--- a/.changeset/ready-jokes-melt.md
+++ b/.changeset/ready-jokes-melt.md
@@ -8,9 +8,9 @@ Add managed management/admin room support to bot mode / appservice mode.
 
 - Add new config options for zero touch provisioning of managed rooms:
 
-\- managedManagementRoom and initialManager for bot mode
+\- initialManager for bot mode
 
-\- managedAdminRoom and initialManager for appservice mode
+\- initialManager for appservice mode
 
 \- If managed modes are enabled while unmanaged rooms are defined the bot will
 crash.
diff --git a/apps/draupnir/src/appservice/config/config.example.yaml b/apps/draupnir/src/appservice/config/config.example.yaml
index 09752b85..0f97de03 100644
--- a/apps/draupnir/src/appservice/config/config.example.yaml
+++ b/apps/draupnir/src/appservice/config/config.example.yaml
@@ -13,9 +13,6 @@ db:
 # See docs/access_control.md
 adminRoom: "#draupnir-admin:localhost:9999"
 
-# Enable automatic admin-room recovery/creation on first boot.
-managedAdminRoom: false
-
 # The initial manager to invite if the admin room has to be created.
 # initialManager: "@admin:example.org"
 
diff --git a/apps/draupnir/src/appservice/config/config.harness.yaml b/apps/draupnir/src/appservice/config/config.harness.yaml
index c87c8724..4d1b7201 100644
--- a/apps/draupnir/src/appservice/config/config.harness.yaml
+++ b/apps/draupnir/src/appservice/config/config.harness.yaml
@@ -8,10 +8,6 @@ db:
 
 adminRoom: "#draupnir-admin:localhost:9999"
 
-managedAdminRoom: false
-
-# initialManager: "@admin:example.org"
-
 # The directory the bot should store various bits of information in
 dataPath: "./test/harness/mjolnir-data/"
 
diff --git a/apps/draupnir/src/appservice/config/config.ts b/apps/draupnir/src/appservice/config/config.ts
index 21c8e5ae..c8d1cead 100644
--- a/apps/draupnir/src/appservice/config/config.ts
+++ b/apps/draupnir/src/appservice/config/config.ts
@@ -82,9 +82,6 @@ export const AppserviceConfig = Type.Object({
     },
     { description: "Details for the database backend" }
   ),
-  managedAdminRoom: Type.Boolean({
-    default: false,
-  }),
   initialManager: Type.Optional(StringUserIDSchema),
   adminRoom: Type.Optional(
     Type.String({
diff --git a/apps/draupnir/test/appservice/integration/managedBootstrapStartTest.ts b/apps/draupnir/test/appservice/integration/managedBootstrapStartTest.ts
index 1ceb69f1..da035456 100644
--- a/apps/draupnir/test/appservice/integration/managedBootstrapStartTest.ts
+++ b/apps/draupnir/test/appservice/integration/managedBootstrapStartTest.ts
@@ -17,7 +17,6 @@ describe("Managed room bootstrap startup integration", function (this: Mocha.Sui
     const testConfigRecord = {
       ...(config as unknown as Record<string, unknown>),
     };
-    testConfigRecord.managedAdminRoom = true;
     testConfigRecord.adminRoom = undefined;
     testConfigRecord.initialManager =
       (await initialManager.getUserId()) as StringUserID;