nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-24.05] nixos/printing: add option to disable browsed daemon (#344711)

Browse Source
This commit is contained in:
Martin Weinelt
2024-09-26 21:59:12 +02:00
committed by GitHub
parent b1354758d2 48db5e72f2
commit 33fbc56f4d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/printing/cupsd.nix
View File

@@ -9,7 +9,6 @@ let
cfg = config.services.printing;
cups = cfg.package;
avahiEnabled = config.services.avahi.enable;
polkitEnabled = config.security.polkit.enable;
additionalBackends = pkgs.runCommand "additional-cups-backends" {
@@ -99,7 +98,7 @@ let
cupsdFile
(writeConf "client.conf" cfg.clientConf)
(writeConf "snmp.conf" cfg.snmpConf)
] ++ optional avahiEnabled browsedFile
] ++ optional cfg.browsed.enable browsedFile
++ cfg.drivers;
pathsToLink = [ "/etc/cups" ];
ignoreCollisions = true;
@@ -270,6 +269,15 @@ in
'';
};
browsed.enable = mkOption {
type = types.bool;
default = config.services.avahi.enable;
defaultText = literalExpression "config.services.avahi.enable";
description = ''
Whether to enable the CUPS Remote Printer Discovery (browsed) daemon.
'';
};
browsedConf = mkOption {
type = types.lines;
default = "";
@@ -419,7 +427,7 @@ in
serviceConfig.PrivateTmp = true;
};
systemd.services.cups-browsed = mkIf avahiEnabled
systemd.services.cups-browsed = mkIf cfg.browsed.enable
{ description = "CUPS Remote Printer Discovery";
wantedBy = [ "multi-user.target" ];