Merge pull request #39612 from bgamari/cupsd-loglevel

cupsd: Introduce services.printing.logLevel option
This commit is contained in:
Jörg Thalheim 2018-04-28 12:50:48 +01:00 committed by GitHub
commit f9fe798f95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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 />