From bd2198efd0d3abd2a92b0296d0bd75a75a24c9ab Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Fri, 28 Mar 2025 15:08:20 -0400
Subject: [PATCH] Revert "Switch to conduwuit"
This reverts commit 32e433123c0e68a7db452d68b456f8d0cceb6ad8.
---
nixos/machines/driftwood/containers/conduit.nix | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/nixos/machines/driftwood/containers/conduit.nix b/nixos/machines/driftwood/containers/conduit.nix
index 7d66cce..df8b731 100644
--- a/nixos/machines/driftwood/containers/conduit.nix
+++ b/nixos/machines/driftwood/containers/conduit.nix
@@ -2,10 +2,9 @@
config,
lib,
pkgs,
- inputs,
...
}: {
- containers.conduit-stranger-systems = {
+ containers.conduit = {
autoStart = true;
privateNetwork = true;
hostAddress = "192.168.100.10";
@@ -18,7 +17,6 @@
isReadOnly = false;
};
};
- nixpkgs = inputs.nixpkgs-unstable.outPath;
config = {
config,
lib,
@@ -26,16 +24,13 @@
...
}: {
# Conduit proper
- services.conduwuit = {
+ services.matrix-conduit = {
enable = true;
settings.global = {
server_name = "stranger.systems";
- rocksdb_optimize_for_spinning_disks = true;
-new_user_displayname_suffix = "";
- allow_registration = true;
- registration_token_file = "/var/lib/conduwuit/reg_token";
- port = [6167];
- address = ["0.0.0.0"];
+ allow_registration = false;
+ port = 6167;
+ address = "0.0.0.0";
};
};
# Open the port