nixos/cupsd: Introduce services.printing.logLevel option

Previously we indirectly suggested that the user use
services.printing.extraConf to set this, but this doesn't work with the
default merge ordering. Fix this by making it an independent option.
Fixes #39611.
This commit is contained in:
Ben Gamari 2018-04-27 16:34:02 +00:00
parent bea11a34fb
commit 192352ff2f

View File

@ -83,6 +83,8 @@ let
WebInterface ${if cfg.webInterface then "Yes" else "No"} WebInterface ${if cfg.webInterface then "Yes" else "No"}
LogLevel ${cfg.logLevel}
${cfg.extraConf} ${cfg.extraConf}
''; '';
@ -165,6 +167,15 @@ in
''; '';
}; };
logLevel = mkOption {
type = types.str;
default = "info";
example = "debug";
description = ''
Specifies the cupsd logging verbosity.
'';
};
extraFilesConf = mkOption { extraFilesConf = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
@ -180,7 +191,7 @@ in
example = example =
'' ''
BrowsePoll cups.example.com BrowsePoll cups.example.com
LogLevel debug MaxCopies 42
''; '';
description = '' description = ''
Extra contents of the configuration file of the CUPS daemon Extra contents of the configuration file of the CUPS daemon
@ -345,8 +356,6 @@ in
services.printing.extraConf = services.printing.extraConf =
'' ''
LogLevel info
DefaultAuthType Basic DefaultAuthType Basic
<Location /> <Location />