summary refs log tree commit diff
path: root/host/Rory-nginx
diff options
context:
space:
mode:
Diffstat (limited to 'host/Rory-nginx')
-rwxr-xr-xhost/Rory-nginx/configuration.nix12
-rwxr-xr-xhost/Rory-nginx/services/containers/matrixunittests/services/conduit.nix3
2 files changed, 8 insertions, 7 deletions
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index c52ab51..9e18ad5 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -84,12 +84,12 @@
   #  conduit = grapevine;
   #};
 
-  containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib grapevine; };
-
-  containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
-    inherit pkgs lib;
-    conduit = conduit;
-  };
+  #containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib grapevine; };
+#
+  #containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = conduit;
+  #};
 
   services.pgadmin = {
     enable = true;
diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
index 58f734b..39f588a 100755
--- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
@@ -11,7 +11,8 @@
       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;
+#      disable_federation = true;
+      
 
       listen = [
         {