From 9ecfaa1c4975b9506a59e96391e0064cec3b29f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 30 Oct 2021 10:22:04 +0100
Subject: [PATCH] restore matrix server

---
 nixos/boxes/bolty/default.nix       | 1 +
 nixos/boxes/bolty/matrix-server.nix | 2 +-
 nixos/boxes/vultr1/default.nix      | 1 +
 nixos/boxes/vultr1/matrix-front.nix | 2 +-
 nixos/libvirt.nix                   | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix
index 0ed3bcfa..2ce364ad 100644
--- a/nixos/boxes/bolty/default.nix
+++ b/nixos/boxes/bolty/default.nix
@@ -9,6 +9,7 @@
     ../cli.nix
     ./print-server.nix
     ./restic-server.nix
+    ./matrix-server.nix
   ];
   services.syncthing = {
     enable = true;
diff --git a/nixos/boxes/bolty/matrix-server.nix b/nixos/boxes/bolty/matrix-server.nix
index ca67b7d0..f7c12db6 100644
--- a/nixos/boxes/bolty/matrix-server.nix
+++ b/nixos/boxes/bolty/matrix-server.nix
@@ -18,7 +18,7 @@
     listeners = [
       {
         port = 8008;
-        bind_address = "brix.cyplo.github.beta.tailscale.net";
+        bind_address = "bolty.cyplo.github.beta.tailscale.net";
         type = "http";
         tls = false;
         x_forwarded = true;
diff --git a/nixos/boxes/vultr1/default.nix b/nixos/boxes/vultr1/default.nix
index 1cd82a06..d292179c 100644
--- a/nixos/boxes/vultr1/default.nix
+++ b/nixos/boxes/vultr1/default.nix
@@ -10,6 +10,7 @@
     ../cli.nix
     ./nginx.nix
     ./folding.nix
+    ./matrix-front.nix
   ];
 
   systemd.extraConfig = ''
diff --git a/nixos/boxes/vultr1/matrix-front.nix b/nixos/boxes/vultr1/matrix-front.nix
index c46a27f4..41f0f29c 100644
--- a/nixos/boxes/vultr1/matrix-front.nix
+++ b/nixos/boxes/vultr1/matrix-front.nix
@@ -31,7 +31,7 @@
             '';
 
             locations."/_matrix" = {
-              proxyPass = "http://brix:8008"; # without a trailing /
+              proxyPass = "http://bolty:8008"; # without a trailing /
             };
           };
         };
diff --git a/nixos/libvirt.nix b/nixos/libvirt.nix
index 2294cf00..efd0b0ee 100644
--- a/nixos/libvirt.nix
+++ b/nixos/libvirt.nix
@@ -7,7 +7,7 @@
   users.extraUsers.cyryl.extraGroups = [ "kvm" ];
 
   environment.systemPackages = with pkgs; [
-    virtmanager qemu
+    virtmanager qemu swtpm
   ];
 
 }