Fixes temp-rollback

4 files changed, 31 insertions, 21 deletions

diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 31d10df..06a8923 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -37,20 +37,27 @@
 #      '';
   };
 
-  containers."pluralcontactbotpoc" = import ./services/containers/pluralcontactbotpoc/container.nix {
-    inherit pkgs lib;
-    conduit = grapevine;
-  };
+  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
+    '';
 
-  containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix {
-    inherit pkgs lib;
-    conduit = grapevine;
-  };
-
-  containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
-    inherit pkgs lib;
-    conduit = conduit;
-  };
+  #containers."pluralcontactbotpoc" = import ./services/containers/pluralcontactbotpoc/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = grapevine;
+  #};
+#
+  #containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = grapevine;
+  #};
+#
+  #containers."matrixunittests-conduit" = import ./services/containers/matrixunittests-conduit/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = conduit;
+  #};
 
   containers."conduwuit-throwaway" = import ./services/containers/conduwuit-throwaway/container.nix {
     inherit pkgs lib;
diff --git a/host/Rory-nginx/services/containers/conduwuit-throwaway/services/nginx.nix b/host/Rory-nginx/services/containers/conduwuit-throwaway/services/nginx.nix
index a33c784..de3b3eb 100755
--- a/host/Rory-nginx/services/containers/conduwuit-throwaway/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/conduwuit-throwaway/services/nginx.nix
@@ -26,7 +26,7 @@
         moreheaders
       ];
       virtualHosts = {
-        "conduit.matrixunittests.rory.gay" = {
+        "tmpthrowaway89123798.rory.gay" = {
           locations."/" = {
             proxyPass = "http://127.0.0.1:6167"; 
             extraConfig = ''
@@ -51,14 +51,14 @@
             more_set_headers 'Content-Type application/json';
             more_set_headers 'Access-Control-Allow-Origin *';
             return 200 '${builtins.toJSON {
-              "m.server" = "conduit.matrixunittests.rory.gay:443";
+              "m.server" = "tmpthrowaway89123798.rory.gay:443";
             }}';
           ''; 
           locations."= /.well-known/matrix/client".extraConfig = ''
             more_set_headers 'Content-Type application/json';
             more_set_headers 'Access-Control-Allow-Origin *';
             return 200 '${builtins.toJSON {
-              "m.homeserver".base_url = "https://conduit.matrixunittests.rory.gay";
+              "m.homeserver".base_url = "https://tmpthrowaway89123798.rory.gay";
             }
             }';
           ''; 
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
index eb830ab..e1c9917 100755
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ b/host/Rory-nginx/services/matrix/conduit.nix
@@ -17,7 +17,10 @@
         }
       ];
 
-      database_backend = "rocksdb";
+      database = {
+        backend = "rocksdb";
+      };
+      
 #      rocksdb_optimize_for_spinning_disks = false;
 #      rocksdb_max_log_file_size = 33554432;
 
diff --git a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
index f6b8077..c2ba62a 100755
--- a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
+++ b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
@@ -60,7 +60,7 @@ in
         }
         { 
           type = "http";
-          path = "/run/synapse/replication-listener.sock";
+          path = "/run/matrix-synapse/replication-listener.sock";
           resources = [ {
             names = [ "replication" ];
             compress = false;
@@ -140,18 +140,18 @@ in
         main = { # replication listener
           #host = "127.0.0.1";
           #port = 8009;
-          path = "/run/synapse/replication-listener.sock";
+          path = "/run/matrix-synapse/replication-listener.sock";
         };
       } // builtins.listToAttrs (map (port: {
         name = "federation_sender-${toString port}";
         value = {
-          path = "/run/synapse/federation_sender-${toString port}.sock";
+          path = "/run/matrix-synapse/federation_sender-${toString port}.sock";
         };
       }) federationSenders);
       #} // builtins.listToAttrs (map (port: {
       #  name = "federation_receiver-${toString port}";
       #  value = {
-      #    path = "/run/synapse/federation_receiver-${toString port}.sock";
+      #    path = "/run/matrix-synapse/federation_receiver-${toString port}.sock";
       #  };
       #}) federationReceivers);