From 73d9b5fb4ecd3af6140c904b39afeacdfbfface4 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 12 Aug 2024 15:21:11 +0200 Subject: [PATCH] Update nixpkgs and move postgresql --- flake.lock | 12 ++++++------ modules/cloud/postgresql/default.nix | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6b020e5..f019a24 100644 --- a/flake.lock +++ b/flake.lock @@ -1063,11 +1063,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722640603, - "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -1223,11 +1223,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1722651103, - "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { diff --git a/modules/cloud/postgresql/default.nix b/modules/cloud/postgresql/default.nix index 1a84647..98038ab 100644 --- a/modules/cloud/postgresql/default.nix +++ b/modules/cloud/postgresql/default.nix @@ -31,6 +31,13 @@ in ensureDatabases = cfg.databases; ensureUsers = (map userFromDatabase cfg.databases); + + dataDir = "/mnt/data/postgresql/${config.services.postgresql.package.psqlSchema}"; + }; + + config.systemd.services.postgresql.serviceConfig = { + StateDirectory = "postgresql postgresql ${config.services.postgresql.dataDir}"; + StateDirectoryMode = "0750"; }; # Backup settings