Unverified Commit 35128eb6 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

nixos/printing: Add openFirewall option (#176539)

parent 315e3635

nixos/modules/services/printing/cupsd.nix

+23 −0
Original line number Diff line number Diff line
@@ -108,6 +108,13 @@ let 
  containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;

  getGutenprint = pkgs: head (filterGutenprint pkgs);



  parsePorts = addresses: let

    splitAddress = addr: lib.strings.splitString ":" addr;

    extractPort = addr: builtins.elemAt (builtins.tail (splitAddress addr)) 0;

    toInt = str: lib.strings.toInt str;

  in

    builtins.map (address: toInt (extractPort address)) addresses;



in



{
@@ -172,6 +179,15 @@ in 
        '';

      };



      openFirewall = mkOption {

        type = types.bool;

        default = false;

        description = ''

          Whether to open the firewall for TCP/UDP ports specified in

          listenAdrresses option.

        '';

      };



      bindirCmds = mkOption {

        type = types.lines;

        internal = true;
@@ -463,6 +479,13 @@ in 


    security.pam.services.cups = {};



    networking.firewall = let

      listenPorts = parsePorts cfg.listenAddresses;

    in mkIf cfg.openFirewall {

      allowedTCPPorts = listenPorts;

      allowedUDPPorts = listenPorts;

    };



  };



  meta.maintainers = with lib.maintainers; [ matthewbauer ];

nixos/tests/printing.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import ./make-test-python.nix ( 
      startWhenNeeded = socket;

      listenAddresses = [ "*:631" ];

      defaultShared = true;

      openFirewall = true;

      extraConf = ''

        <Location />

          Order allow,deny
@@ -26,7 +27,6 @@ import ./make-test-python.nix ( 
        </Location>

      '';

    };

    networking.firewall.allowedTCPPorts = [ 631 ];

    # Add a HP Deskjet printer connected via USB to the server.

    hardware.printers.ensurePrinters = [{

      name = "DeskjetLocal";