Server cleanup

4 files changed, 44 insertions, 69 deletions

diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index 9221781..648d8d5 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -35,6 +35,12 @@
 #      127.0.0.1 matrix.rory.gay
 #      127.0.0.1 conduit.rory.gay
 #      '';
+    nat = {
+      enable = true;
+      internalInterfaces = [ "ve-+" "vb-+" ];
+      externalInterface = "ens18";
+      #enableIPv6 = true;
+    };
   };
 
   environment.memoryAllocator.provider = "jemalloc";
@@ -54,10 +60,10 @@
     conduit = conduit;
   };
 
-  containers."conduwuit-throwaway" = import ./services/containers/conduwuit-throwaway/container.nix {
-    inherit pkgs lib;
-    conduit = conduwuit;
-  };
+  #containers."conduwuit-throwaway" = import ./services/containers/conduwuit-throwaway/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = conduwuit;
+  #};
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix
deleted file mode 100755
index eb830ab..0000000
--- a/host/Rory-nginx/services/matrix/conduit.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services.grapevine = {
-    #package = conduit.packages.${pkgs.system}.default;
-    enable = true;
-    settings = {
-      conduit_compat = true;
-#      address = "127.0.0.1";
-      server_name = "conduit.rory.gay";
-      
-      listen = [
-        {
-          type = "tcp";
-          address = "127.0.0.1";
-          port = 6167;
-        }
-      ];
-
-      database_backend = "rocksdb";
-#      rocksdb_optimize_for_spinning_disks = false;
-#      rocksdb_max_log_file_size = 33554432;
-
-#      allow_public_room_directory_over_federation = true;
-    
-#      allow_device_name_federation = true;
-#      enable_lightning_bolt = true;
-
-
-      #allow_local_presence = true;
-      #allow_incoming_presence = true;
-      #allow_outgoing_presence = true;
-      #presence_idle_timeout_s = 60;
-      #presence_offline_timeout_s = 180;
-
-
-#      max_concurrent_requests = 32767;
-#      conduit_cache_capacity_modifier = 4000.0; #512.0;
-#      db_cache_capacity_mb = 65535.0; #8192.0;
-#      rocksdb_parallelism_threads = 12;
-      
-      #dns settings
-#      dns_cache_entries = 65535;
-#      dns_min_ttl = 60 * 60 * 12; #12 hours... we expect other servers to backfill in the unlikely case an IP changes.
-#      dns_min_ttl_nxdomain = 60 * 60 * 24 * 7; #1 week... we expect backfill to happen must this change...
-#      dns_timeout = 15;
-#      dns_attempts = 15; #our DNS setup tends to fail
-#      query_all_nameservers = true; #needed on our setup...
-
-#      federation_timeout = 30;
-#      federation_idle_per_host = 8;
-#      federation_idle_timeout = 600;
-
-
-      allow_check_for_updates = false;
-      allow_registration = false;
-
-      #log = "info";
-      #log_format = "full";
-      #log = "debug";
-    };
-  };
-}
-
diff --git a/host/Rory-nginx/services/matrix/grapevine.nix b/host/Rory-nginx/services/matrix/grapevine.nix
new file mode 100755
index 0000000..700c4bb
--- /dev/null
+++ b/host/Rory-nginx/services/matrix/grapevine.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.grapevine = {
+    #package = conduit.packages.${pkgs.system}.default;
+    enable = true;
+    settings = {
+      conduit_compat = true;
+#      address = "127.0.0.1";
+      server_name = "conduit.rory.gay";
+      
+      listen = [
+        {
+          type = "tcp";
+          address = "127.0.0.1";
+          port = 6167;
+        }
+      ];
+
+      database = {
+        backend = "rocksdb";
+      };
+
+      allow_check_for_updates = false;
+      allow_registration = false;
+
+      #log = "info";
+      #log_format = "full";
+      #log = "debug";
+    };
+  };
+}
+
diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix
index ac4f5ce..3ab3028 100755
--- a/host/Rory-nginx/services/matrix/root.nix
+++ b/host/Rory-nginx/services/matrix/root.nix
@@ -7,7 +7,7 @@
       ./coturn.nix
       ./matrix-appservice-discord.nix
       ./draupnir.nix
-      ./conduit.nix
+      ./grapevine.nix
       #./matrix-media-gate.nix
     ];