3 files changed, 3 insertions, 13 deletions

diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix

index 1de1ddf..cbd90f8 100755..100644
--- a/host/Rory-nginx/services/containers/matrixunittests/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix
@@ -17,12 +17,7 @@
         grapevine.nixosModules.default
 
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [
diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix

index a49a003..cd5776f 100755..100644
--- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
@@ -6,13 +6,7 @@
     enable = true;
     settings = {
       server_name = "matrixunittests.rory.gay";
-      enable_lightning_bolt = true;
-      max_concurrent_requests = 1000;
-      allow_check_for_updates = false;
       allow_registration = true;
-      yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true;
-      allow_guest_registration = true;
-      disable_federation = true;
 
       listen = [
         {
@@ -21,6 +15,8 @@
           port = 6167;
         }
       ];
+      federation.enable = false;
+      server_discovery.client.base_url = "https://matrixunittests.rory.gay"; # This is required for some reason
 
       database = {
         backend = "rocksdb";
@@ -44,5 +40,4 @@
       Restart = "on-failure";
     };
   };
-
 }
diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix

index 0236182..0236182 100755..100644
--- a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix