Update from server

6 files changed, 29 insertions, 12 deletions

diff --git a/clean-old-generations.sh b/clean-old-generations.sh
new file mode 100755
index 0000000..8b42df6
--- /dev/null
+++ b/clean-old-generations.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+nix-collect-garbage -d
+/nix/var/nix/profiles/system/bin/switch-to-configuration boot
+nix-collect-garbage -d
+/nix/var/nix/profiles/system/bin/switch-to-configuration boot
diff --git a/host/Rory-nginx/services/cgit.nix b/host/Rory-nginx/services/cgit.nix
index 686da78..dbab79c 100644
--- a/host/Rory-nginx/services/cgit.nix
+++ b/host/Rory-nginx/services/cgit.nix
@@ -13,7 +13,7 @@ let base_cgit_config = {
     about-filter = "${pkgs.cgit-pink}/lib/cgit/filters/about-formatting.sh";
     source-filter = "${pkgs.cgit-pink}/lib/cgit/filters/syntax-highlighting.py";
     clone-url = (lib.concatStringsSep " " [
-      "https://git.rory.gay/$CGIT_REPO_URL"
+      "https://cgit.rory.gay/$CGIT_REPO_URL"
       "ssh://<user>@git.rory.gay:$CGIT_REPO_URL"
     ]);
     enable-log-filecount = 1;
@@ -45,7 +45,7 @@ let base_cgit_config = {
     scanPath = "/data/nginx/html_git/.ocp";
     nginx.location = "/.ocp/";
     settings.clone-url = (lib.concatStringsSep " " [
-      "https://git.rory.gay/.ocp/$CGIT_REPO_URL"
+      "https://cgit.rory.gay/.ocp/$CGIT_REPO_URL"
       "ssh://<user>@git.rory.gay:.ocp/$CGIT_REPO_URL"
     ]);
   };
diff --git a/host/Rory-nginx/services/jitsi.nix b/host/Rory-nginx/services/jitsi.nix
index a73fb8c..02b0af9 100755
--- a/host/Rory-nginx/services/jitsi.nix
+++ b/host/Rory-nginx/services/jitsi.nix
@@ -4,7 +4,7 @@
   services.jitsi-videobridge.openFirewall = true;
   services.jitsi-meet = {
     enable = true;
-    #nginx.enable = true;
+    nginx.enable = true;
     hostName = "jitsi.rory.gay";
 #    interfaceConfig = {
 #      APP_NAME = "Rory&'s Jitsi Meet Instance";
diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix
index b5f5608..a527164 100755
--- a/host/Rory-nginx/services/matrix/draupnir.nix
+++ b/host/Rory-nginx/services/matrix/draupnir.nix
@@ -14,15 +14,17 @@
         ssl = false;
       };
     };
-    managementRoom = "#draupnir-mgmt:rory.gay";
-    homeserverUrl = "http://localhost:8008";
-    verboseLogging = false;
     settings = {
-      recordIgnoredInvites = false;
-      automaticallyRedactForReasons = [ "*" ];
+      managementRoom = "#draupnir-mgmt:rory.gay";
+      verboseLogging = false;
+      recordIgnoredInvites = true; # Let's log ignored invites, just incase
+      autojoinOnlyIfManager = true; # Let's not open ourselves up to DoS attacks
+      automaticallyRedactForReasons = [ "*" ]; # I always want autoredact
       fasterMembershipChecks = true;
-      backgroundDelayMS = 100;
-      pollReports = true;
+
+      backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit
+      pollReports = false; # this is a single person homeserver... let's save ourself the work
+      
       admin.enableMakeRoomAdminCommand = true;
       commands.ban.defaultReasons = [
         "spam"
@@ -42,5 +44,10 @@
     };
   };
 
+#  services.pantalaimon-headless.instances.draupnir = {
+#    homeserver = "http://localhost:8008";
+#    ssl = false;
+#  };
+
 }
 
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index b80c01b..0250cc3 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -41,11 +41,11 @@
         "terra.thearcanebrony.net" = import ./thearcanebrony.net/terra.nix;
         "vives.thearcanebrony.net" = import ./thearcanebrony.net/vives.nix;
         "rory.gay" = import ./rory.gay/root.nix;
-        "rory.boo" = import ./rory.gay/root.nix;
+        #"rory.boo" = import ./rory.gay/root.nix;
         "lfs.rory.gay" = import ./rory.gay/lfs.nix;
         "git.rory.gay" = import ./rory.gay/git.nix;
         "cgit.rory.gay" = import ./rory.gay/cgit.nix;
-        "tunnel.rory.boo" = import ./rory.boo/tunnel.nix;
+        #"tunnel.rory.boo" = import ./rory.boo/tunnel.nix;
         "boorunav.com" = import ./boorunav.com/root.nix;
         "catgirlsaresexy.com" = import ./catgirlsaresexy.com/root.nix;
         "sugarcanemc.org" = import ./sugarcanemc.org/root.nix;
diff --git a/rebuild-wsl-no-update.sh b/rebuild-wsl-no-update.sh
new file mode 100755
index 0000000..0f9284c
--- /dev/null
+++ b/rebuild-wsl-no-update.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+nom build .#nixosConfigurations.${HOSTNAME}.config.system.build.toplevel && sudo nixos-rebuild switch --flake .#${HOSTNAME}
+#./build.sh / $HOSTNAME