public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55667 from amazari/master

Browse Source 
zoneminder: fix build issue when using createLocally database
This commit is contained in:
Peter Hoeg 2019-02-15 22:00:31 +08:00 committed by GitHub
commit 507855e56c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/misc/zoneminder.nix
View File

@ -205,15 +205,13 @@ in {
mysql = lib.mkIf cfg.database.createLocally { mysql = lib.mkIf cfg.database.createLocally {
ensureDatabases = [ cfg.database.name ]; ensureDatabases = [ cfg.database.name ];
ensureUsers = { ensureUsers = [{
name = cfg.database.username; name = cfg.database.username;
ensurePermissions = [ ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
{ "${cfg.database.name}.*" = "ALL PRIVILEGES"; }
];
initialDatabases = [ initialDatabases = [
{ inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; } { inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; }
]; ];
}; }];
}; };
nginx = lib.mkIf useNginx { nginx = lib.mkIf useNginx {