Replace ensurePermissions with ensureDBOwnership which is required in NixOS 24.05

This also requires changing the user/group to match the database name
This commit is contained in:
Sandro Jäckel 2024-05-24 02:21:41 +02:00
parent c5fddfba89
commit f8d91b6a7b
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
3 changed files with 6 additions and 9 deletions

View file

@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713805509, "lastModified": 1716358718,
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "rev": "3f316d2a50699a78afe5e77ca486ad553169061e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -10,7 +10,6 @@
outputs = { self, nixpkgs, utils, naersk }: outputs = { self, nixpkgs, utils, naersk }:
let let
inherit (nixpkgs) lib;
makeBuzzrelay = pkgs: makeBuzzrelay = pkgs:
let let
naersk-lib = pkgs.callPackage naersk { }; naersk-lib = pkgs.callPackage naersk { };

View file

@ -27,11 +27,11 @@
}; };
user = mkOption { user = mkOption {
type = types.str; type = types.str;
default = "relay"; default = "buzzrelay";
}; };
group = mkOption { group = mkOption {
type = types.str; type = types.str;
default = "relay"; default = "buzzrelay";
}; };
logLevel = mkOption { logLevel = mkOption {
type = types.enum [ "ERROR" "WARN" "INFO" "DEBUG" "TRACE" ]; type = types.enum [ "ERROR" "WARN" "INFO" "DEBUG" "TRACE" ];
@ -87,9 +87,7 @@
ensureDatabases = [ cfg.database ]; ensureDatabases = [ cfg.database ];
ensureUsers = [ { ensureUsers = [ {
name = cfg.user; name = cfg.user;
ensurePermissions = { ensureDBOwnership = true;
"DATABASE ${cfg.database}" = "ALL PRIVILEGES";
};
} ]; } ];
}; };