From 3e488d7da097ed623756a36142480d5557b80b19 Mon Sep 17 00:00:00 2001
From: David Crompton <david.crompton@mail.utoronto.ca>
Date: Tue, 16 Jan 2024 11:22:24 -0500
Subject: [PATCH] 24.05 Preparation

---
 machines/kcnhub/hardware-configuration.nix | 2 +-
 machines/kcnhub/servers/gitea.nix          | 5 ++---
 machines/kcnhub/servers/guac.nix           | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/machines/kcnhub/hardware-configuration.nix b/machines/kcnhub/hardware-configuration.nix
index 3914757..8202988 100644
--- a/machines/kcnhub/hardware-configuration.nix
+++ b/machines/kcnhub/hardware-configuration.nix
@@ -21,7 +21,7 @@
   ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  boot.initrd.services.swraid.enable = true;
+  boot.swraid.enable = true;
 
   # Cache and Thin Provisioning Support
   services.lvm.boot.thin.enable = true;
diff --git a/machines/kcnhub/servers/gitea.nix b/machines/kcnhub/servers/gitea.nix
index f6ca0ce..256bce1 100644
--- a/machines/kcnhub/servers/gitea.nix
+++ b/machines/kcnhub/servers/gitea.nix
@@ -43,9 +43,8 @@ in {
     port = 5432;
     ensureUsers = [{
       name = "gitea";
-      ensurePermissions = {
-        "DATABASE \"gitea\"" = "ALL PRIVILEGES";
-      };
+      # Ensures gitea user owns a db called gitea
+      ensureDBOwnership = true;
       ensureClauses = {
         createdb = true;
       };
diff --git a/machines/kcnhub/servers/guac.nix b/machines/kcnhub/servers/guac.nix
index 6799bab..4c1bf19 100644
--- a/machines/kcnhub/servers/guac.nix
+++ b/machines/kcnhub/servers/guac.nix
@@ -53,9 +53,8 @@
     ];
     ensureUsers = [{
       name = "guacamole";
-      ensurePermissions = {
-        "DATABASE \"guacamole\"" = "ALL PRIVILEGES";
-      };
+      # Ensures guacamole user owns a db called guacamole
+      ensureDBOwnership = true;
       ensureClauses = {
         createdb = true;
       };