Revert naming changes

119 files changed, 146 insertions, 146 deletions

diff --git a/host/Rory-nginx-old/configuration.nix b/host/Rory-nginx-old/configuration.nix
deleted file mode 100644

index 44f693b..0000000
--- a/host/Rory-nginx-old/configuration.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  grapevine,
-  conduit,
-  conduwuit,
-  nixpkgs-Draupnir,
-  ...
-}:
-
-{
-  imports = [
-    ../../modules/base-server.nix
-    ../../modules/users/levi.nix
-    ../../modules/users/db2k.nix
-    ../../modules/users/ks.nix
-    ../../modules/users/Alice.nix
-
-    ./services/postgres.nix
-    ./services/matrix/root.nix
-    ./services/nginx/nginx.nix
-    #./services/jitsi.nix
-    ./services/cgit.nix
-    ./services/ollama.nix
-    ./services/deluge.nix
-    ./services/prometheus.nix
-
-    ./services/email/root.nix
-  ];
-
-  users.groups.ocp = { };
-  networking = {
-    hostName = "Rory-nginx-old";
-    interfaces.ens18.ipv4.addresses = [
-      {
-        address = "192.168.1.2";
-        prefixLength = 24;
-      }
-    ];
-    interfaces.ens19.ipv4.addresses = [
-      {
-        address = "10.10.10.2";
-        prefixLength = 16;
-      }
-    ];
-    defaultGateway.interface = "ens18";
-    nat = {
-      enable = true;
-      internalInterfaces = [
-        "ve-+"
-        "vb-+"
-      ];
-      externalInterface = "ens18";
-      enableIPv6 = false;
-    };
-    enableIPv6 = lib.mkForce false;
-    nameservers = lib.mkForce [ "192.168.1.1" ];
-  };
-
-  monitoring = {
-    monitorAll = true;
-    localPrometheus = true;
-    exposePrometheus = true;
-    localGrafana = true;
-    exposeGrafana = true;
-    nginxHost = "monitoring.old.rory.gay";
-    nginxSsl = true;
-  };
-
-  nixpkgs.config.permittedInsecurePackages = [
-    "olm-3.2.16"
-    "dotnet-runtime-wrapped-7.0.20"
-    "dotnet-runtime-7.0.20"
-    "dotnet-sdk-7.0.20"
-  ];
-  services.irqbalance.enable = true;
-
-  environment.memoryAllocator.provider = "jemalloc";
-
-  #containers."pluralcontactbotpoc" = import ./services/containers/pluralcontactbotpoc/container.nix {
-  #  inherit pkgs lib;
-  #  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;
-  #};
-
-  services.pgadmin = {
-    enable = false;
-    initialEmail = "root@localhost.localdomain";
-    initialPasswordFile = "/etc/matrix-user-pass";
-  };
-  containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
-    inherit pkgs lib nixpkgs-Draupnir;
-  };
-  containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
-    inherit pkgs lib nixpkgs-Draupnir;
-  };
-
-  #containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
-
-  system.stateVersion = "22.11"; # DO NOT EDIT!
-
-  environment.systemPackages = with pkgs; [ waypipe ];
-  nix.nrBuildUsers = 128;
-}
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix

index 62cfc3f..59a118c 100755..100644
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -17,32 +17,45 @@
     ../../modules/users/ks.nix
     ../../modules/users/Alice.nix
 
+    ./services/postgres.nix
+    ./services/matrix/root.nix
+    ./services/nginx/nginx.nix
+    #./services/jitsi.nix
+    ./services/cgit.nix
+    ./services/ollama.nix
+    ./services/deluge.nix
     ./services/prometheus.nix
 
+    ./services/email/root.nix
   ];
 
   users.groups.ocp = { };
-  boot.loader.grub.devices = lib.mkForce [ "nodev" ];
   networking = {
     hostName = "Rory-nginx";
-    interfaces.enp98s0f0.ipv4.addresses = [
+    interfaces.ens18.ipv4.addresses = [
       {
-        address = "51.210.113.110";
+        address = "192.168.1.2";
         prefixLength = 24;
       }
     ];
-    defaultGateway.interface = "enp98s0f0";
+    interfaces.ens19.ipv4.addresses = [
+      {
+        address = "10.10.10.2";
+        prefixLength = 16;
+      }
+    ];
+    defaultGateway.interface = "ens18";
     nat = {
       enable = true;
       internalInterfaces = [
         "ve-+"
         "vb-+"
       ];
-      externalInterface = "enp98s0f0";
+      externalInterface = "ens18";
       enableIPv6 = false;
     };
     enableIPv6 = lib.mkForce false;
-    nameservers = lib.mkForce [ "1.1.1.1" ];
+    nameservers = lib.mkForce [ "192.168.1.1" ];
   };
 
   monitoring = {
@@ -51,7 +64,7 @@
     exposePrometheus = true;
     localGrafana = true;
     exposeGrafana = true;
-    nginxHost = "monitoring.rory.gay";
+    nginxHost = "monitoring.old.rory.gay";
     nginxSsl = true;
   };
 
@@ -64,14 +77,35 @@
   services.irqbalance.enable = true;
 
   environment.memoryAllocator.provider = "jemalloc";
-  
-  #containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
-  #  inherit pkgs lib nixpkgs-Draupnir;
+
+  #containers."pluralcontactbotpoc" = import ./services/containers/pluralcontactbotpoc/container.nix {
+  #  inherit pkgs lib;
+  #  conduit = grapevine;
   #};
-  #containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
-  #  inherit pkgs lib nixpkgs-Draupnir;
+
+  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 = false;
+    initialEmail = "root@localhost.localdomain";
+    initialPasswordFile = "/etc/matrix-user-pass";
+  };
+  containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
+    inherit pkgs lib nixpkgs-Draupnir;
+  };
+  containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
+    inherit pkgs lib nixpkgs-Draupnir;
+  };
+
+  #containers."draupnir-linux-mint" = import ./services/containers/draupnir-linux-mint/container.nix { inherit pkgs lib nixpkgs-Draupnir; };
+
   system.stateVersion = "22.11"; # DO NOT EDIT!
 
   environment.systemPackages = with pkgs; [ waypipe ];
diff --git a/host/Rory-nginx/hooks/post-rebuild.sh b/host/Rory-nginx/hooks/post-rebuild.sh

index 9b0c17c..9b0c17c 100755..100644
--- a/host/Rory-nginx/hooks/post-rebuild.sh
+++ b/host/Rory-nginx/hooks/post-rebuild.sh
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/container.nix b/host/Rory-nginx/services/containers/draupnir-cme/container.nix

index 7b87264..7b87264 100755..100644
--- a/host/Rory-nginx/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/root.nix b/host/Rory-nginx/services/containers/draupnir-cme/root.nix

index 0ebce9e..0ebce9e 100755..100644
--- a/host/Rory-nginx/services/containers/draupnir-cme/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/root.nix
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix b/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix

index cf59809..cf59809 100755..100644
--- a/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-linux-mint/container.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix

index 41d25c5..41d25c5 100644
--- a/host/Rory-nginx-old/services/containers/draupnir-linux-mint/container.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/container.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-linux-mint/root.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix

index 2adac62..2adac62 100644
--- a/host/Rory-nginx-old/services/containers/draupnir-linux-mint/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-linux-mint/services/draupnir.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/services/draupnir.nix

index 042651a..042651a 100644
--- a/host/Rory-nginx-old/services/containers/draupnir-linux-mint/services/draupnir.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/services/draupnir.nix
diff --git a/host/Rory-nginx-old/services/containers/matrixunittests-conduit/container.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix

index daefba1..daefba1 100644
--- a/host/Rory-nginx-old/services/containers/matrixunittests-conduit/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
diff --git a/host/Rory-nginx-old/services/containers/matrixunittests-conduit/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/conduit.nix

index 3df71be..3df71be 100644
--- a/host/Rory-nginx-old/services/containers/matrixunittests-conduit/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/conduit.nix
diff --git a/host/Rory-nginx-old/services/containers/matrixunittests-conduit/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/nginx.nix

index 0d7874e..0d7874e 100644
--- a/host/Rory-nginx-old/services/containers/matrixunittests-conduit/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/services/nginx.nix
diff --git a/host/Rory-nginx-old/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix

index cbd90f8..cbd90f8 100644
--- a/host/Rory-nginx-old/services/containers/matrixunittests/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix
diff --git a/host/Rory-nginx-old/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix

index cd5776f..cd5776f 100644
--- a/host/Rory-nginx-old/services/containers/matrixunittests/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix
diff --git a/host/Rory-nginx-old/services/containers/matrixunittests/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix

index 0236182..0236182 100644
--- a/host/Rory-nginx-old/services/containers/matrixunittests/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix
diff --git a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix

index 6be7c83..6be7c83 100644
--- a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/container.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
diff --git a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/root.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix

index 11d0be3..11d0be3 100644
--- a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/root.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
diff --git a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/services/conduit.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix

index db9df9a..db9df9a 100644
--- a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/services/conduit.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix
diff --git a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/services/nginx.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix

index 9d8041a..9d8041a 100644
--- a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/services/nginx.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix
diff --git a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/services/pantalaimon.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix

index 335176f..335176f 100644
--- a/host/Rory-nginx-old/services/containers/pluralcontactbotpoc/services/pantalaimon.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix
diff --git a/host/Rory-nginx-old/services/deluge.nix b/host/Rory-nginx/services/deluge.nix

index 4a499ed..4a499ed 100644
--- a/host/Rory-nginx-old/services/deluge.nix
+++ b/host/Rory-nginx/services/deluge.nix
diff --git a/host/Rory-nginx-old/services/jitsi.nix b/host/Rory-nginx/services/jitsi.nix

index 9fe8d73..9fe8d73 100644
--- a/host/Rory-nginx-old/services/jitsi.nix
+++ b/host/Rory-nginx/services/jitsi.nix
diff --git a/host/Rory-nginx/services/matrix/coturn.nix b/host/Rory-nginx/services/matrix/coturn.nix

index 805faa9..805faa9 100755..100644
--- a/host/Rory-nginx/services/matrix/coturn.nix
+++ b/host/Rory-nginx/services/matrix/coturn.nix
diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix

index 40d1489..40d1489 100755..100644
--- a/host/Rory-nginx/services/matrix/draupnir.nix
+++ b/host/Rory-nginx/services/matrix/draupnir.nix
diff --git a/host/Rory-nginx/services/matrix/grapevine.nix b/host/Rory-nginx/services/matrix/grapevine.nix

index 7368c2a..c73b48c 100755..100644
--- a/host/Rory-nginx/services/matrix/grapevine.nix
+++ b/host/Rory-nginx/services/matrix/grapevine.nix
@@ -7,7 +7,6 @@
       conduit_compat = true;
       server_name = "conduit.rory.gay";
       #trusted_servers = [ "rory.gay" ];
-      federation.self_test = false;
 
       listen = [
         {
diff --git a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix

index 3041aaa..3041aaa 100755..100644
--- a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix
+++ b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix
diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix

index d32cc54..5bb3915 100755..100644
--- a/host/Rory-nginx/services/matrix/root.nix
+++ b/host/Rory-nginx/services/matrix/root.nix
@@ -7,6 +7,7 @@
     ./matrix-appservice-discord.nix
     ./draupnir.nix
     ./grapevine.nix
+    #    ./sliding-sync.nix # removed from nixpkgs, use synapse support instead
     ./ooye.nix
   ];
 
diff --git a/host/Rory-nginx-old/services/matrix/sliding-sync.nix b/host/Rory-nginx/services/matrix/sliding-sync.nix

index a8fbd0c..a8fbd0c 100644
--- a/host/Rory-nginx-old/services/matrix/sliding-sync.nix
+++ b/host/Rory-nginx/services/matrix/sliding-sync.nix
diff --git a/host/Rory-nginx/services/matrix/synapse/caches.nix b/host/Rory-nginx/services/matrix/synapse/caches.nix

index f00c78c..9fa735e 100644
--- a/host/Rory-nginx/services/matrix/synapse/caches.nix
+++ b/host/Rory-nginx/services/matrix/synapse/caches.nix
@@ -6,7 +6,6 @@
   ];
   gc_thresholds = [
     10000
-    
     5000
     2500
   ];
diff --git a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix

index 02456df..ae63b82 100755..100644
--- a/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
+++ b/host/Rory-nginx/services/matrix/synapse/synapse-main.nix
@@ -17,7 +17,7 @@
     mediaRepoWorkers = 2; # 4
     clientReaders = 2; # 4
     syncWorkers = 2; # 4
-    #authWorkers = 0;
+    authWorkers = 0;
 
     eventCreators = 16;
 
@@ -75,7 +75,7 @@
           max_long_retry_delay = "30s";
 
           # rapid retry, small increments
-          destination_min_retry_interval = "1m"; # default=10m
+          destination_min_retry_interval = "5m"; # default=10m
           destination_max_retry_interval = "12h"; # default=7d
           destination_retry_multiplier = 1.2; # default=2
         };
@@ -195,23 +195,17 @@
     after = [ "network.target" ];
 
     script = ''
-      set -e -x -o pipefail
-      echo "Starting key generation"
+
       if [ ! -f "registration_shared_secret.txt" ]
       then
-        echo "Generating new key"
-        strace cat /dev/urandom | tr -dc a-zA-Z0-9 | fold -w 256 | head -n 1 > registration_shared_secret.txt
-        echo "Key generation complete"
+        cat /dev/urandom | tr -dc a-zA-Z0-9 | fold -w 256 | head -n 1 > registration_shared_secret.txt
       else
-        echo "Not generating key, key exists"
-      fi
-      echo "Script complete"
-    '';
+        echo Not generating key, key exists;
+      fi'';
     serviceConfig = {
       User = "matrix-synapse";
       Group = "matrix-synapse";
       WorkingDirectory = "/var/lib/matrix-synapse";
-      RemainAfterExit = true;
     };
   };
 
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/auth.nix b/host/Rory-nginx/services/matrix/synapse/workers/auth.nix

index 3c8d1e9..3c8d1e9 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/auth.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/auth.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/client-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix

index 9a0aafa..9a0aafa 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/client-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/client-reader.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/event-creator.nix b/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix

index 2be7a5b..2be7a5b 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/event-creator.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/event-creator.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/federation-inbound.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-inbound.nix

index effaa69..effaa69 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/federation-inbound.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-inbound.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/federation-reader.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix

index 04bfe7c..04bfe7c 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/federation-reader.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-reader.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/federation-sender.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix

index 468916e..468916e 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/federation-sender.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/media-repo.nix b/host/Rory-nginx/services/matrix/synapse/workers/media-repo.nix

index 1e0c638..1e0c638 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/media-repo.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/media-repo.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/module.nix b/host/Rory-nginx/services/matrix/synapse/workers/module.nix

index 3b6456b..3b6456b 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/module.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/module.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/pusher.nix b/host/Rory-nginx/services/matrix/synapse/workers/pusher.nix

index edf1632..edf1632 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/pusher.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/pusher.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/single/appservice.nix b/host/Rory-nginx/services/matrix/synapse/workers/single/appservice.nix

index 119fd04..119fd04 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/single/appservice.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/single/appservice.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/single/background.nix b/host/Rory-nginx/services/matrix/synapse/workers/single/background.nix

index 37fde10..37fde10 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/single/background.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/single/background.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/single/user-dir.nix b/host/Rory-nginx/services/matrix/synapse/workers/single/user-dir.nix

index f26f3ec..f26f3ec 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/single/user-dir.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/single/user-dir.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix

index 48649f6..48649f6 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/account_data-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix

index 5395aea..5395aea 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix

index e6487ca..e6487ca 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/presence-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix

index 4a4af04..4a4af04 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/push_rule-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix

index 54c31b4..54c31b4 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/receipt-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix

index 5fd0bd0..5fd0bd0 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/shared-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix

index 2b487d6..2b487d6 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/to_device-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix

index 5bff505..5bff505 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/typing-stream-writer.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/workers/sync.nix b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix

index 67b63dd..67b63dd 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/workers/sync.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/sync.nix
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix

index 01eaac6..01eaac6 100755..100644
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/bots.nix b/host/Rory-nginx/services/nginx/rory.gay/bots.nix

index 9bd18a8..9bd18a8 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/bots.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/bots.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/cgit.nix b/host/Rory-nginx/services/nginx/rory.gay/cgit.nix

index 812e946..812e946 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/cgit.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/cgit.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/conduit.matrixunittests.nix b/host/Rory-nginx/services/nginx/rory.gay/conduit.matrixunittests.nix

index 9503747..9503747 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/conduit.matrixunittests.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.matrixunittests.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix

index ef0fbd8..ef0fbd8 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/ec.nix b/host/Rory-nginx/services/nginx/rory.gay/ec.nix

index 0985503..0985503 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/ec.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/ec.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix b/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix

index 9469087..9469087 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/jitsi.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix

index 5d44454..5d44454 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix

index d48f4ca..d48f4ca 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix b/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix

index edb1704..edb1704 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/mru.nix b/host/Rory-nginx/services/nginx/rory.gay/mru.nix

index d1e1cd7..d1e1cd7 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/mru.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/mru.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix b/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix

index b62c5fe..b62c5fe 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/root.nix b/host/Rory-nginx/services/nginx/rory.gay/root.nix

index 11d06c0..11d06c0 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/root.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/root.nix
diff --git a/host/Rory-nginx/services/nginx/rory.gay/wad-api.nix b/host/Rory-nginx/services/nginx/rory.gay/wad-api.nix

index 65e9bdb..65e9bdb 100755..100644
--- a/host/Rory-nginx/services/nginx/rory.gay/wad-api.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/wad-api.nix
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix

index f13cb0c..f13cb0c 100755..100644
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix

index 86dddac..86dddac 100755..100644
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix

index cd655d8..cd655d8 100755..100644
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix

index f496190..f496190 100755..100644
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix
diff --git a/host/Rory-nginx-old/services/ollama.nix b/host/Rory-nginx/services/ollama.nix

index 16f4e1c..16f4e1c 100644
--- a/host/Rory-nginx-old/services/ollama.nix
+++ b/host/Rory-nginx/services/ollama.nix
diff --git a/host/Rory-nginx/services/postgres.nix b/host/Rory-nginx/services/postgres.nix

index f0fb3e7..f0fb3e7 100755..100644
--- a/host/Rory-nginx/services/postgres.nix
+++ b/host/Rory-nginx/services/postgres.nix
diff --git a/host/Rory-nginx-old/services/redpanda/root.nix b/host/Rory-nginx/services/redpanda/root.nix

index ef169a6..ef169a6 100644
--- a/host/Rory-nginx-old/services/redpanda/root.nix
+++ b/host/Rory-nginx/services/redpanda/root.nix
diff --git a/host/Rory-nginx-old/services/redpanda/systemd-services.nix b/host/Rory-nginx/services/redpanda/systemd-services.nix

index c75a5be..c75a5be 100644
--- a/host/Rory-nginx-old/services/redpanda/systemd-services.nix
+++ b/host/Rory-nginx/services/redpanda/systemd-services.nix
diff --git a/host/Rory-ovh/configuration.nix b/host/Rory-ovh/configuration.nix
new file mode 100755

index 0000000..7c031c4
--- /dev/null
+++ b/host/Rory-ovh/configuration.nix
@@ -0,0 +1,79 @@
+{
+  pkgs,
+  config,
+  lib,
+  grapevine,
+  conduit,
+  conduwuit,
+  nixpkgs-Draupnir,
+  ...
+}:
+
+{
+  imports = [
+    ../../modules/base-server.nix
+    ../../modules/users/levi.nix
+    ../../modules/users/db2k.nix
+    ../../modules/users/ks.nix
+    ../../modules/users/Alice.nix
+
+    ./services/prometheus.nix
+
+  ];
+
+  users.groups.ocp = { };
+  boot.loader.grub.devices = lib.mkForce [ "nodev" ];
+  networking = {
+    hostName = "Rory-ovh";
+    interfaces.enp98s0f0.ipv4.addresses = [
+      {
+        address = "51.210.113.110";
+        prefixLength = 24;
+      }
+    ];
+    defaultGateway.interface = "enp98s0f0";
+    nat = {
+      enable = true;
+      internalInterfaces = [
+        "ve-+"
+        "vb-+"
+      ];
+      externalInterface = "enp98s0f0";
+      enableIPv6 = false;
+    };
+    enableIPv6 = lib.mkForce false;
+    nameservers = lib.mkForce [ "1.1.1.1" ];
+  };
+
+  monitoring = {
+    monitorAll = true;
+    localPrometheus = true;
+    exposePrometheus = true;
+    localGrafana = true;
+    exposeGrafana = true;
+    nginxHost = "monitoring.rory.gay";
+    nginxSsl = true;
+  };
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+    "dotnet-runtime-wrapped-7.0.20"
+    "dotnet-runtime-7.0.20"
+    "dotnet-sdk-7.0.20"
+  ];
+  services.irqbalance.enable = true;
+
+  environment.memoryAllocator.provider = "jemalloc";
+  
+  #containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
+  #  inherit pkgs lib nixpkgs-Draupnir;
+  #};
+  #containers."draupnir-fedora" = import ./services/containers/draupnir-fedora/container.nix {
+  #  inherit pkgs lib nixpkgs-Draupnir;
+  #};
+
+  system.stateVersion = "22.11"; # DO NOT EDIT!
+
+  environment.systemPackages = with pkgs; [ waypipe ];
+  nix.nrBuildUsers = 128;
+}
diff --git a/host/Rory-nginx-old/hooks/post-rebuild.sh b/host/Rory-ovh/hooks/post-rebuild.sh

index 9b0c17c..9b0c17c 100644..100755
--- a/host/Rory-nginx-old/hooks/post-rebuild.sh
+++ b/host/Rory-ovh/hooks/post-rebuild.sh
diff --git a/host/Rory-nginx-old/services/cgit.nix b/host/Rory-ovh/services/cgit.nix

index fb762d1..fb762d1 100644
--- a/host/Rory-nginx-old/services/cgit.nix
+++ b/host/Rory-ovh/services/cgit.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-cme/container.nix b/host/Rory-ovh/services/containers/draupnir-cme/container.nix

index 7b87264..7b87264 100644..100755
--- a/host/Rory-nginx-old/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/container.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-cme/root.nix b/host/Rory-ovh/services/containers/draupnir-cme/root.nix

index 0ebce9e..0ebce9e 100644..100755
--- a/host/Rory-nginx-old/services/containers/draupnir-cme/root.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/root.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-cme/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-cme/services/draupnir.nix

index cf59809..cf59809 100644..100755
--- a/host/Rory-nginx-old/services/containers/draupnir-cme/services/draupnir.nix
+++ b/host/Rory-ovh/services/containers/draupnir-cme/services/draupnir.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-fedora/container.nix b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix

index 82683d7..82683d7 100644
--- a/host/Rory-nginx-old/services/containers/draupnir-fedora/container.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/container.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-fedora/root.nix b/host/Rory-ovh/services/containers/draupnir-fedora/root.nix

index 0ebce9e..0ebce9e 100644
--- a/host/Rory-nginx-old/services/containers/draupnir-fedora/root.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/root.nix
diff --git a/host/Rory-nginx-old/services/containers/draupnir-fedora/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix

index 6573f4c..6573f4c 100644
--- a/host/Rory-nginx-old/services/containers/draupnir-fedora/services/draupnir.nix
+++ b/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix
diff --git a/host/Rory-nginx-old/services/containers/shared.nix b/host/Rory-ovh/services/containers/shared.nix

index f267ff0..f267ff0 100644
--- a/host/Rory-nginx-old/services/containers/shared.nix
+++ b/host/Rory-ovh/services/containers/shared.nix
diff --git a/host/Rory-nginx-old/services/email/autoconfig.nix b/host/Rory-ovh/services/email/autoconfig.nix

index d258046..d258046 100644
--- a/host/Rory-nginx-old/services/email/autoconfig.nix
+++ b/host/Rory-ovh/services/email/autoconfig.nix
diff --git a/host/Rory-nginx-old/services/email/maddy.conf b/host/Rory-ovh/services/email/maddy.conf

index 1d3eb2f..1d3eb2f 100644
--- a/host/Rory-nginx-old/services/email/maddy.conf
+++ b/host/Rory-ovh/services/email/maddy.conf
diff --git a/host/Rory-nginx-old/services/email/maddy.nix b/host/Rory-ovh/services/email/maddy.nix

index 07b6e72..07b6e72 100644
--- a/host/Rory-nginx-old/services/email/maddy.nix
+++ b/host/Rory-ovh/services/email/maddy.nix
diff --git a/host/Rory-nginx-old/services/email/nginx.nix b/host/Rory-ovh/services/email/nginx.nix

index 812993a..812993a 100644
--- a/host/Rory-nginx-old/services/email/nginx.nix
+++ b/host/Rory-ovh/services/email/nginx.nix
diff --git a/host/Rory-nginx-old/services/email/root.nix b/host/Rory-ovh/services/email/root.nix

index 7db85d8..7db85d8 100644
--- a/host/Rory-nginx-old/services/email/root.nix
+++ b/host/Rory-ovh/services/email/root.nix
diff --git a/host/Rory-nginx-old/services/mastodon.nix b/host/Rory-ovh/services/mastodon.nix

index 56f1808..56f1808 100644
--- a/host/Rory-nginx-old/services/mastodon.nix
+++ b/host/Rory-ovh/services/mastodon.nix
diff --git a/host/Rory-nginx-old/services/matrix/coturn.nix b/host/Rory-ovh/services/matrix/coturn.nix

index 805faa9..805faa9 100644..100755
--- a/host/Rory-nginx-old/services/matrix/coturn.nix
+++ b/host/Rory-ovh/services/matrix/coturn.nix
diff --git a/host/Rory-nginx-old/services/matrix/draupnir.nix b/host/Rory-ovh/services/matrix/draupnir.nix

index 40d1489..40d1489 100644..100755
--- a/host/Rory-nginx-old/services/matrix/draupnir.nix
+++ b/host/Rory-ovh/services/matrix/draupnir.nix
diff --git a/host/Rory-nginx-old/services/matrix/grapevine.nix b/host/Rory-ovh/services/matrix/grapevine.nix

index c73b48c..7368c2a 100644..100755
--- a/host/Rory-nginx-old/services/matrix/grapevine.nix
+++ b/host/Rory-ovh/services/matrix/grapevine.nix
@@ -7,6 +7,7 @@
       conduit_compat = true;
       server_name = "conduit.rory.gay";
       #trusted_servers = [ "rory.gay" ];
+      federation.self_test = false;
 
       listen = [
         {
diff --git a/host/Rory-nginx-old/services/matrix/matrix-appservice-discord.nix b/host/Rory-ovh/services/matrix/matrix-appservice-discord.nix

index 3041aaa..3041aaa 100644..100755
--- a/host/Rory-nginx-old/services/matrix/matrix-appservice-discord.nix
+++ b/host/Rory-ovh/services/matrix/matrix-appservice-discord.nix
diff --git a/host/Rory-nginx-old/services/matrix/ooye.nix b/host/Rory-ovh/services/matrix/ooye.nix

index 7b9c403..7b9c403 100644
--- a/host/Rory-nginx-old/services/matrix/ooye.nix
+++ b/host/Rory-ovh/services/matrix/ooye.nix
diff --git a/host/Rory-nginx-old/services/matrix/root.nix b/host/Rory-ovh/services/matrix/root.nix

index 5bb3915..d32cc54 100644..100755
--- a/host/Rory-nginx-old/services/matrix/root.nix
+++ b/host/Rory-ovh/services/matrix/root.nix
@@ -7,7 +7,6 @@
     ./matrix-appservice-discord.nix
     ./draupnir.nix
     ./grapevine.nix
-    #    ./sliding-sync.nix # removed from nixpkgs, use synapse support instead
     ./ooye.nix
   ];
 
diff --git a/host/Rory-nginx-old/services/matrix/synapse/caches.nix b/host/Rory-ovh/services/matrix/synapse/caches.nix

index 9fa735e..f00c78c 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/caches.nix
+++ b/host/Rory-ovh/services/matrix/synapse/caches.nix
@@ -6,6 +6,7 @@
   ];
   gc_thresholds = [
     10000
+    
     5000
     2500
   ];
diff --git a/host/Rory-nginx-old/services/matrix/synapse/db.nix b/host/Rory-ovh/services/matrix/synapse/db.nix

index 409c039..409c039 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/db.nix
+++ b/host/Rory-ovh/services/matrix/synapse/db.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/ratelimits.nix b/host/Rory-ovh/services/matrix/synapse/ratelimits.nix

index ffce1cc..ffce1cc 100644
--- a/host/Rory-nginx-old/services/matrix/synapse/ratelimits.nix
+++ b/host/Rory-ovh/services/matrix/synapse/ratelimits.nix
diff --git a/host/Rory-nginx-old/services/matrix/synapse/synapse-main.nix b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix

index ae63b82..02456df 100644..100755
--- a/host/Rory-nginx-old/services/matrix/synapse/synapse-main.nix
+++ b/host/Rory-ovh/services/matrix/synapse/synapse-main.nix
@@ -17,7 +17,7 @@
     mediaRepoWorkers = 2; # 4
     clientReaders = 2; # 4
     syncWorkers = 2; # 4
-    authWorkers = 0;
+    #authWorkers = 0;
 
     eventCreators = 16;
 
@@ -75,7 +75,7 @@
           max_long_retry_delay = "30s";
 
           # rapid retry, small increments
-          destination_min_retry_interval = "5m"; # default=10m
+          destination_min_retry_interval = "1m"; # default=10m
           destination_max_retry_interval = "12h"; # default=7d
           destination_retry_multiplier = 1.2; # default=2
         };
@@ -195,17 +195,23 @@
     after = [ "network.target" ];
 
     script = ''
-
+      set -e -x -o pipefail
+      echo "Starting key generation"
       if [ ! -f "registration_shared_secret.txt" ]
       then
-        cat /dev/urandom | tr -dc a-zA-Z0-9 | fold -w 256 | head -n 1 > registration_shared_secret.txt
+        echo "Generating new key"
+        strace cat /dev/urandom | tr -dc a-zA-Z0-9 | fold -w 256 | head -n 1 > registration_shared_secret.txt
+        echo "Key generation complete"
       else
-        echo Not generating key, key exists;
-      fi'';
+        echo "Not generating key, key exists"
+      fi
+      echo "Script complete"
+    '';
     serviceConfig = {
       User = "matrix-synapse";
       Group = "matrix-synapse";
       WorkingDirectory = "/var/lib/matrix-synapse";
+      RemainAfterExit = true;
     };
   };
 
diff --git a/host/Rory-nginx-old/services/nginx/nginx.nix b/host/Rory-ovh/services/nginx/nginx.nix

index 01eaac6..01eaac6 100644..100755
--- a/host/Rory-nginx-old/services/nginx/nginx.nix
+++ b/host/Rory-ovh/services/nginx/nginx.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/bots.nix b/host/Rory-ovh/services/nginx/rory.gay/bots.nix

index 9bd18a8..9bd18a8 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/bots.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/bots.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/cgit.nix b/host/Rory-ovh/services/nginx/rory.gay/cgit.nix

index 812e946..812e946 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/cgit.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/cgit.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/conduit.matrixunittests.nix b/host/Rory-ovh/services/nginx/rory.gay/conduit.matrixunittests.nix

index 9503747..9503747 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/conduit.matrixunittests.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/conduit.matrixunittests.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/conduit.nix b/host/Rory-ovh/services/nginx/rory.gay/conduit.nix

index ef0fbd8..ef0fbd8 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/conduit.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/conduit.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/ec.nix b/host/Rory-ovh/services/nginx/rory.gay/ec.nix

index 0985503..0985503 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/ec.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/ec.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/jitsi.nix b/host/Rory-ovh/services/nginx/rory.gay/jitsi.nix

index 9469087..9469087 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/jitsi.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/jitsi.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/matrix-bak.nix b/host/Rory-ovh/services/nginx/rory.gay/matrix-bak.nix

index 5d44454..5d44454 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/matrix-bak.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/matrix-bak.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/matrix.nix b/host/Rory-ovh/services/nginx/rory.gay/matrix.nix

index d48f4ca..d48f4ca 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/matrix.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/matrix.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/matrixunittests.nix b/host/Rory-ovh/services/nginx/rory.gay/matrixunittests.nix

index edb1704..edb1704 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/matrixunittests.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/matrixunittests.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/mru.nix b/host/Rory-ovh/services/nginx/rory.gay/mru.nix

index d1e1cd7..d1e1cd7 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/mru.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/mru.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/pcpoc.nix b/host/Rory-ovh/services/nginx/rory.gay/pcpoc.nix

index b62c5fe..b62c5fe 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/pcpoc.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/pcpoc.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/root.nix b/host/Rory-ovh/services/nginx/rory.gay/root.nix

index 11d06c0..11d06c0 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/root.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/root.nix
diff --git a/host/Rory-nginx-old/services/nginx/rory.gay/wad-api.nix b/host/Rory-ovh/services/nginx/rory.gay/wad-api.nix

index 65e9bdb..65e9bdb 100644..100755
--- a/host/Rory-nginx-old/services/nginx/rory.gay/wad-api.nix
+++ b/host/Rory-ovh/services/nginx/rory.gay/wad-api.nix
diff --git a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/awooradio.nix b/host/Rory-ovh/services/nginx/thearcanebrony.net/awooradio.nix

index f13cb0c..f13cb0c 100644..100755
--- a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/awooradio.nix
+++ b/host/Rory-ovh/services/nginx/thearcanebrony.net/awooradio.nix
diff --git a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/root.nix b/host/Rory-ovh/services/nginx/thearcanebrony.net/root.nix

index 86dddac..86dddac 100644..100755
--- a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/root.nix
+++ b/host/Rory-ovh/services/nginx/thearcanebrony.net/root.nix
diff --git a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/search.nix b/host/Rory-ovh/services/nginx/thearcanebrony.net/search.nix

index cd655d8..cd655d8 100644..100755
--- a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/search.nix
+++ b/host/Rory-ovh/services/nginx/thearcanebrony.net/search.nix
diff --git a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/sentry.nix b/host/Rory-ovh/services/nginx/thearcanebrony.net/sentry.nix

index f496190..f496190 100644..100755
--- a/host/Rory-nginx-old/services/nginx/thearcanebrony.net/sentry.nix
+++ b/host/Rory-ovh/services/nginx/thearcanebrony.net/sentry.nix
diff --git a/host/Rory-nginx-old/services/postgres.nix b/host/Rory-ovh/services/postgres.nix

index f0fb3e7..f0fb3e7 100644..100755
--- a/host/Rory-nginx-old/services/postgres.nix
+++ b/host/Rory-ovh/services/postgres.nix
diff --git a/host/Rory-nginx-old/services/prometheus.nix b/host/Rory-ovh/services/prometheus.nix

index 9409529..9409529 100644
--- a/host/Rory-nginx-old/services/prometheus.nix
+++ b/host/Rory-ovh/services/prometheus.nix