diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-04-27 16:34:02 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-04-27 16:41:49 +0000 |
| commit | 192352ff2f9a736f959a569a74cd42fcdb29021c (patch) | |
| tree | 628f7375954bb7970a720a1026383348ad1fa8a7 /nixos/modules/services/printing | |
| parent | bea11a34fbcefe24a66cf64c7388124db567a17d (diff) | |
| download | nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.tar nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.tar.gz nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.tar.bz2 nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.tar.lz nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.tar.xz nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.tar.zst nixlib-192352ff2f9a736f959a569a74cd42fcdb29021c.zip | |
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.
Diffstat (limited to 'nixos/modules/services/printing')
| -rw-r--r-- | nixos/modules/services/printing/cupsd.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df9..c4147986439c 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -83,6 +83,8 @@ let WebInterface ${if cfg.webInterface then "Yes" else "No"} + LogLevel ${cfg.logLevel} + ${cfg.extraConf} ''; @@ -165,6 +167,15 @@ in ''; }; + logLevel = mkOption { + type = types.str; + default = "info"; + example = "debug"; + description = '' + Specifies the cupsd logging verbosity. + ''; + }; + extraFilesConf = mkOption { type = types.lines; default = ""; @@ -180,7 +191,7 @@ in example = '' BrowsePoll cups.example.com - LogLevel debug + MaxCopies 42 ''; description = '' Extra contents of the configuration file of the CUPS daemon @@ -345,8 +356,6 @@ in services.printing.extraConf = '' - LogLevel info - DefaultAuthType Basic <Location /> |