From de74e5d3f4d37c865b3e449fb4de83712960cdc2 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Fri, 26 Apr 2024 18:54:27 +0100
Subject: [PATCH] ops/nixos: remove ensurePermissions

---
 ops/nixos/bvm-matrix/default.nix        | 3 ---
 ops/nixos/bvm-paperless/default.nix     | 3 ---
 ops/nixos/bvm-twitterchiver/default.nix | 1 -
 ops/nixos/howl/default.nix              | 4 ----
 ops/nixos/lib/baserow.nix               | 3 ---
 ops/nixos/lib/quotes.bfob.gg.nix        | 3 ---
 ops/nixos/nausicaa/default.nix          | 4 ----
 ops/nixos/porcorosso/default.nix        | 4 ----
 ops/nixos/totoro/default.nix            | 3 ---
 9 files changed, 28 deletions(-)

diff --git a/ops/nixos/bvm-matrix/default.nix b/ops/nixos/bvm-matrix/default.nix
index 2d435cab52..41d98fdd35 100644
--- a/ops/nixos/bvm-matrix/default.nix
+++ b/ops/nixos/bvm-matrix/default.nix
@@ -46,9 +46,6 @@
     ensureDatabases = [ "matrix-synapse" ];
     ensureUsers = [{
       name = "matrix-synapse";
-      ensurePermissions = {
-        "DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES";
-      };
     }];
   };
   services.coturn = {
diff --git a/ops/nixos/bvm-paperless/default.nix b/ops/nixos/bvm-paperless/default.nix
index 7a51471ee6..cee9677321 100644
--- a/ops/nixos/bvm-paperless/default.nix
+++ b/ops/nixos/bvm-paperless/default.nix
@@ -45,9 +45,6 @@ in {
     enable = true;
     ensureUsers = [{
       name = "paperless";
-      ensurePermissions = {
-        "DATABASE paperless" = "ALL PRIVILEGES";
-      };
     }];
     ensureDatabases = [ "paperless" ];
   };
diff --git a/ops/nixos/bvm-twitterchiver/default.nix b/ops/nixos/bvm-twitterchiver/default.nix
index f6f3a3a36e..fbb1ed7bf8 100644
--- a/ops/nixos/bvm-twitterchiver/default.nix
+++ b/ops/nixos/bvm-twitterchiver/default.nix
@@ -28,7 +28,6 @@
     ];
     ensureUsers = [{
       name = "twitterchiver";
-      ensurePermissions = { "DATABASE twitterchiver" = "ALL PRIVILEGES"; };
     }];
   };
   services.postgresqlBackup.enable = true;
diff --git a/ops/nixos/howl/default.nix b/ops/nixos/howl/default.nix
index b1f2d75abf..db0931d9c3 100644
--- a/ops/nixos/howl/default.nix
+++ b/ops/nixos/howl/default.nix
@@ -191,10 +191,6 @@ in {
   services.postgresql.ensureDatabases = [ "lukegb" ];
   services.postgresql.ensureUsers = [{
     name = "lukegb";
-    ensurePermissions = {
-      "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-      "DATABASE lukegb" = "ALL PRIVILEGES";
-    };
   }];
   services.postgresql.authentication = ''
     local all all              trust
diff --git a/ops/nixos/lib/baserow.nix b/ops/nixos/lib/baserow.nix
index a582f54ef5..fe48705823 100644
--- a/ops/nixos/lib/baserow.nix
+++ b/ops/nixos/lib/baserow.nix
@@ -51,9 +51,6 @@ in
     enable = true;
     ensureUsers = [{
       name = "baserow";
-      ensurePermissions = {
-        "DATABASE baserow" = "ALL PRIVILEGES";
-      };
     }];
     ensureDatabases = [ "baserow" ];
   };
diff --git a/ops/nixos/lib/quotes.bfob.gg.nix b/ops/nixos/lib/quotes.bfob.gg.nix
index 130033281e..fca7991c3b 100644
--- a/ops/nixos/lib/quotes.bfob.gg.nix
+++ b/ops/nixos/lib/quotes.bfob.gg.nix
@@ -60,9 +60,6 @@ in
       ensureDatabases = lib.mkAfter [ "quotesdb" ];
       ensureUsers = lib.mkAfter [{
         name = "quotesdb";
-        ensurePermissions = {
-          "DATABASE quotesdb" = "ALL PRIVILEGES";
-        };
       }];
     };
 
diff --git a/ops/nixos/nausicaa/default.nix b/ops/nixos/nausicaa/default.nix
index 0109eec829..8320dd65e2 100644
--- a/ops/nixos/nausicaa/default.nix
+++ b/ops/nixos/nausicaa/default.nix
@@ -269,10 +269,6 @@ in {
   services.postgresql.ensureDatabases = [ "lukegb" ];
   services.postgresql.ensureUsers = [{
     name = "lukegb";
-    ensurePermissions = {
-      "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-      "DATABASE lukegb" = "ALL PRIVILEGES";
-    };
   }];
   services.postgresql.authentication = ''
     local all all              trust
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 58153fbe75..7baad3328e 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -333,10 +333,6 @@ in {
   services.postgresql.ensureDatabases = [ "lukegb" ];
   services.postgresql.ensureUsers = [{
     name = "lukegb";
-    ensurePermissions = {
-      "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-      "DATABASE lukegb" = "ALL PRIVILEGES";
-    };
   }];
   services.postgresql.authentication = ''
     local all all              trust
diff --git a/ops/nixos/totoro/default.nix b/ops/nixos/totoro/default.nix
index e8c10f1267..ca38e881ec 100644
--- a/ops/nixos/totoro/default.nix
+++ b/ops/nixos/totoro/default.nix
@@ -269,9 +269,6 @@ in {
     ensureDatabases = ["pancake"];
     ensureUsers = [{
       name = "pancake";
-      ensurePermissions = {
-        "pancake.*" = "ALL PRIVILEGES";
-      };
     }];
   };