b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tree-wide: fix errors and warning related to loaOf deprecation

Browse source
This commit is contained in:
Milan Pässler 2020-01-07 06:05:49 +01:00 committed by Milan Pässler
parent 370355449f
commit 2a31a6a412
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/mail/dovecot.nix
View file

@ -334,7 +334,7 @@ in
} // optionalAttrs (cfg.group == "dovecot2") {
dovecot2.gid = config.ids.gids.dovecot2;
} // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
${cfg.mailgroup} = { };
${cfg.mailGroup} = { };
};
environment.etc."dovecot/modules".source = modulesDir;

2
nixos/modules/services/mail/opendkim.nix
View file

@ -99,7 +99,7 @@ in {
};
users.groups = optionalAttrs (cfg.group == "opendkim") {
opendkimgid = config.ids.gids.opendkim;
opendkim.gid = config.ids.gids.opendkim;
};
environment.systemPackages = [ pkgs.opendkim ];

4
nixos/modules/services/mail/postfix.nix
View file

@ -665,9 +665,9 @@ in
users.groups =
optionalAttrs (group == "postfix")
{ group.gid = config.ids.gids.postfix;
{ ${group}.gid = config.ids.gids.postfix;
}
++ optionalAttrs (setgidGroup == "postdrop")
// optionalAttrs (setgidGroup == "postdrop")
{ ${setgidGroup}.gid = config.ids.gids.postdrop;
};

16
nixos/modules/services/networking/quassel.nix
View file

@ -92,17 +92,21 @@ in
message = "Quassel needs a certificate file in order to require SSL";
}];
users.users = mkIf (cfg.user == null) [
{ name = "quassel";
users.users = optionalAttrs (cfg.user == null) {
quassel = {
name = "quassel";
description = "Quassel IRC client daemon";
group = "quassel";
uid = config.ids.uids.quassel;
}];
};
};
users.groups = mkIf (cfg.user == null) [
{ name = "quassel";
users.groups = optionalAttrs (cfg.user == null) {
quassel = {
name = "quassel";
gid = config.ids.gids.quassel;
}];
};
};
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${user} - - -"