From fd994340227bb7b44e79919b0d509d566b8f8a80 Mon Sep 17 00:00:00 2001
From: RGBCube <git@rgbcu.be>
Date: Tue, 16 Jan 2024 11:49:36 +0300
Subject: [PATCH] Set PG users in the respective config file

---
 hosts/cube/grafana.nix    |  8 ++++++++
 hosts/cube/nextcloud.nix  |  8 ++++++++
 hosts/cube/postgresql.nix | 13 +++----------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/hosts/cube/grafana.nix b/hosts/cube/grafana.nix
index 4136edc..ea2dd64 100644
--- a/hosts/cube/grafana.nix
+++ b/hosts/cube/grafana.nix
@@ -13,6 +13,14 @@ in serverSystemConfiguration {
     maxretry = 3;
   };
 
+  services.postgresql = {
+    ensureDatabases = [ "grafana" ];
+    ensureUsers     = [{
+      name = "grafana";
+      ensureDBOwnership = true;
+    }];
+  };
+
   systemd.services.grafana.requires = [ "postgresql.service" ];
 
   services.grafana = enabled {
diff --git a/hosts/cube/nextcloud.nix b/hosts/cube/nextcloud.nix
index 37a7b8d..e17be95 100644
--- a/hosts/cube/nextcloud.nix
+++ b/hosts/cube/nextcloud.nix
@@ -7,6 +7,14 @@ let
 in serverSystemConfiguration {
   age.secrets."cube/password.nextcloud".owner      = "nextcloud";
 
+  services.postgresql = {
+    ensureDatabases = [ "nextcloud" ];
+    ensureUsers     = [{
+      name = "nextcloud";
+      ensureDBOwnership = true;
+    }];
+  };
+
   systemd.services = {
     nextcloud-setup.requires = [ "postgresql.service" ];
     phpfpm-nextcloud.aliases = [ "nextcloud.service" ];
diff --git a/hosts/cube/postgresql.nix b/hosts/cube/postgresql.nix
index 4c5dcf4..15812e8 100644
--- a/hosts/cube/postgresql.nix
+++ b/hosts/cube/postgresql.nix
@@ -27,13 +27,11 @@
 
     identMap = ''
     # Map           System   DBUser
-      superuser_map root     postgres
-      superuser_map postgres postgres
+      superuser_map root     ^(.*)$
+      superuser_map postgres ^(.*)$
       superuser_map /^(.*)$  \1
     '';
 
-    ensureDatabases = [ "grafana" "nextcloud" ];
-
     ensureUsers = [
       {
         name = "postgres";
@@ -46,12 +44,7 @@
         };
       }
       {
-        name = "grafana";
-        ensureDBOwnership = true;
-      }
-      {
-        name = "nextcloud";
-        ensureDBOwnership = true;
+        name = "root";
       }
     ];