refactor: update postgresql password and hash file

modules/nixos/services/storage/postgresql/default.nix

@@ -55,30 +55,17 @@ in {
         ensureDatabases = hostDatabases;
 
         ensureUsers =
-          [
+          mainServices
-            {
+          |> map (service: {
-              name = "pgbouncer_auth";
+            name = service;
-              ensureClauses = let
+            ensureDBOwnership = true;
-                secrets = readJsonOrEmpty "${inputs.self}/secrets/crypt/secrets.json";
+            ensureClauses = let
-                hash = getIn "postgresql.pgbouncer_auth.hash" secrets;
+              secrets = readJsonOrEmpty "${inputs.self}/secrets/crypt/postgresql.json";
-              in {
+            in {
-                login = true;
+              login = true;
-                password = hash;
+              password = getIn "${service}.hash" secrets;
-              };
+            };
-            }
+          });
-          ]
-          ++ (mainServices
-            |> map (service: {
-              name = service;
-              ensureDBOwnership = true;
-              ensureClauses = let
-                secrets = readJsonOrEmpty "${inputs.self}/secrets/crypt/secrets.json";
-                hash = getIn "postgresql.${service}.hash" secrets;
-              in {
-                login = true;
-                password = hash;
-              };
-            }));
       };
 
       postgresqlBackup = {

modules/nixos/services/storage/postgresql/pgbouncer.nix

@@ -52,8 +52,8 @@ in {
         {
           name = "pgbouncer_auth";
           ensureClauses = let
-            secrets = readJsonOrEmpty "${inputs.self}/secrets/crypt/secrets.json";
+            secrets = readJsonOrEmpty "${inputs.self}/secrets/crypt/postgresql.json";
-            hash = getIn "postgresql.pgbouncer_auth.hash" secrets;
+            hash = getIn "pgbouncer_auth.hash" secrets;
           in {
             login = true;
             password = hash;