mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #331784 from SuperSandro2000/pam-motd-writeText

Browse Source 
nixos/pam: fix writeFile no longer taking null as an argument warning
This commit is contained in:
Sandro 2024-08-15 09:32:42 +02:00 committed by GitHub
commit bbbc7bcdb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/security/pam.nix
View File

@ -866,7 +866,7 @@ let
{ name = "limits"; enable = cfg.limits != []; control = "required"; modulePath = "${package}/lib/security/pam_limits.so"; settings = {
conf = "${makeLimitsConf cfg.limits}";
}; }
{ name = "motd"; enable = cfg.showMotd && (config.users.motd != null || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = {
{ name = "motd"; enable = cfg.showMotd && (config.users.motd != "" || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = {
inherit motd;
}; }
{ name = "apparmor"; enable = cfg.enableAppArmor && config.security.apparmor.enable; control = "optional"; modulePath = "${pkgs.apparmor-pam}/lib/security/pam_apparmor.so"; settings = {
@ -1478,9 +1478,9 @@ in
'';
users.motd = mkOption {
default = null;
default = "";
example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178.";
type = types.nullOr types.lines;
type = types.lines;
description = "Message of the day shown to users when they log in.";
};
@ -1498,7 +1498,7 @@ in
config = {
assertions = [
{
assertion = config.users.motd == null || config.users.motdFile == null;
assertion = config.users.motd == "" || config.users.motdFile == null;
message = ''
Only one of users.motd and users.motdFile can be set.
'';