dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/printing: add option to disable browsed daemon (#344702)

Browse Source
This commit is contained in:
Martin Weinelt 2024-09-26 20:44:57 +02:00 committed by GitHub
commit e04b941dfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats 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; cfg = config.services.printing;
cups = cfg.package; cups = cfg.package;
avahiEnabled = config.services.avahi.enable;
polkitEnabled = config.security.polkit.enable; polkitEnabled = config.security.polkit.enable;
additionalBackends = pkgs.runCommand "additional-cups-backends" { additionalBackends = pkgs.runCommand "additional-cups-backends" {
@ -99,7 +98,7 @@ let
cupsdFile cupsdFile
(writeConf "client.conf" cfg.clientConf) (writeConf "client.conf" cfg.clientConf)
(writeConf "snmp.conf" cfg.snmpConf) (writeConf "snmp.conf" cfg.snmpConf)
] ++ optional avahiEnabled browsedFile ] ++ optional cfg.browsed.enable browsedFile
++ cfg.drivers; ++ cfg.drivers;
pathsToLink = [ "/etc/cups" ]; pathsToLink = [ "/etc/cups" ];
ignoreCollisions = true; 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 { browsedConf = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
@ -419,7 +427,7 @@ in
serviceConfig.PrivateTmp = true; serviceConfig.PrivateTmp = true;
}; };
systemd.services.cups-browsed = mkIf avahiEnabled systemd.services.cups-browsed = mkIf cfg.browsed.enable
{ description = "CUPS Remote Printer Discovery"; { description = "CUPS Remote Printer Discovery";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];