From e7b4c81f296eac19ab5fd169966cd4fee3b86946 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 24 Dec 2023 12:56:47 +0100
Subject: [PATCH] Use ensureDBOwnership instead of ensurePermissions

---
 modules/services/grafana/default.nix   |  2 +-
 modules/services/matrix/default.nix    | 12 +++---------
 modules/services/nextcloud/default.nix |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/modules/services/grafana/default.nix b/modules/services/grafana/default.nix
index 0c3afd69..4095fd32 100644
--- a/modules/services/grafana/default.nix
+++ b/modules/services/grafana/default.nix
@@ -77,7 +77,7 @@
         ensureDatabases = [ "grafana" ];
         ensureUsers = [{
           name = "grafana";
-          ensurePermissions = { "DATABASE grafana" = "ALL PRIVILEGES"; };
+          ensureDBOwnership = true;
         }];
       };
     };
diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index 7731081a..a7e0981f 100644
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -79,21 +79,15 @@
         ensureUsers = [
           {
             name = "matrix_appservice_slack";
-            ensurePermissions = {
-              "DATABASE matrix_appservice_slack" = "ALL PRIVILEGES";
-            };
+            ensureDBOwnership = true;
           }
           {
             name = "mautrix_whatsapp";
-            ensurePermissions = {
-              "DATABASE mautrix_whatsapp" = "ALL PRIVILEGES";
-            };
+            ensureDBOwnership = true;
           }
           {
             name = "matrix-synapse";
-            ensurePermissions = {
-              "DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES";
-            };
+            ensureDBOwnership = true;
           }
         ];
       };
diff --git a/modules/services/nextcloud/default.nix b/modules/services/nextcloud/default.nix
index 0ecc32d8..635aa811 100644
--- a/modules/services/nextcloud/default.nix
+++ b/modules/services/nextcloud/default.nix
@@ -47,7 +47,7 @@
         ensureDatabases = [ "nextcloud" ];
         ensureUsers = [{
           name = "nextcloud";
-          ensurePermissions = { "DATABASE nextcloud" = "ALL PRIVILEGES"; };
+          ensureDBOwnership = true;
         }];
       };
       redis.servers.nextcloud = {