From be1affb0b2eccb904d150dee4b26095afab8e65c Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Thu, 18 Jun 2026 17:45:57 -0700
Subject: [PATCH] Refactor the Prosody config files.

---
 Config/Prosody/etc-prosody-example/README                | 9 ---------
 Config/Prosody/etc/README.md                             | 7 +++++++
 .../conf.avail/example.com.cfg.lua                       | 0
 .../conf.avail/localhost.cfg.lua                         | 0
 .../migrator.cfg.lua => etc/migrator.cfg.lua.dist}       | 0
 .../prosody.cfg.lua => etc/prosody.cfg.lua.dist}         | 0
 6 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 Config/Prosody/etc-prosody-example/README
 create mode 100644 Config/Prosody/etc/README.md
 rename Config/Prosody/{etc-prosody-example => etc}/conf.avail/example.com.cfg.lua (100%)
 rename Config/Prosody/{etc-prosody-example => etc}/conf.avail/localhost.cfg.lua (100%)
 rename Config/Prosody/{etc-prosody-example/migrator.cfg.lua => etc/migrator.cfg.lua.dist} (100%)
 rename Config/Prosody/{etc-prosody-example/prosody.cfg.lua => etc/prosody.cfg.lua.dist} (100%)

diff --git a/Config/Prosody/etc-prosody-example/README b/Config/Prosody/etc-prosody-example/README
deleted file mode 100644
index b1e8eb1..0000000
--- a/Config/Prosody/etc-prosody-example/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Prosody configuration directory
-===============================
-
-The configuration file /etc/prosody/prosody.cfg.lua should contain
-only global settings.
-
-Per-host configuration files should be placed in /etc/prosody/conf.avail/,
-and the active ones should be linked in /etc/prosody/conf.d/
-
diff --git a/Config/Prosody/etc/README.md b/Config/Prosody/etc/README.md
new file mode 100644
index 0000000..560dcb2
--- /dev/null
+++ b/Config/Prosody/etc/README.md
@@ -0,0 +1,7 @@
+# Config/Prosody/etc
+
+These files will be copied to /etc/prosody/* on the container.
+
+Default example files are provided in the conf.avail directory and should not be modified.
+
+Rather, copy the files named *.lua.dist to be renamed without .dist, then edit the .lua files as needed.
diff --git a/Config/Prosody/etc-prosody-example/conf.avail/example.com.cfg.lua b/Config/Prosody/etc/conf.avail/example.com.cfg.lua
similarity index 100%
rename from Config/Prosody/etc-prosody-example/conf.avail/example.com.cfg.lua
rename to Config/Prosody/etc/conf.avail/example.com.cfg.lua
diff --git a/Config/Prosody/etc-prosody-example/conf.avail/localhost.cfg.lua b/Config/Prosody/etc/conf.avail/localhost.cfg.lua
similarity index 100%
rename from Config/Prosody/etc-prosody-example/conf.avail/localhost.cfg.lua
rename to Config/Prosody/etc/conf.avail/localhost.cfg.lua
diff --git a/Config/Prosody/etc-prosody-example/migrator.cfg.lua b/Config/Prosody/etc/migrator.cfg.lua.dist
similarity index 100%
rename from Config/Prosody/etc-prosody-example/migrator.cfg.lua
rename to Config/Prosody/etc/migrator.cfg.lua.dist
diff --git a/Config/Prosody/etc-prosody-example/prosody.cfg.lua b/Config/Prosody/etc/prosody.cfg.lua.dist
similarity index 100%
rename from Config/Prosody/etc-prosody-example/prosody.cfg.lua
rename to Config/Prosody/etc/prosody.cfg.lua.dist