Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/cups fixes #65040

Merged
merged 7 commits into from Aug 14, 2019

Conversation

@matthewbauer
Copy link
Member

commented Jul 18, 2019

Motivation for this change

Some changes to the NixOS CUPS module. Summaries:

  • Set CUPS_DATADIR globally
  • only enable cups service when startWhenNeeded = false
  • include /var/run/cups/cups.sock in ListenStreams
  • Disable webInterface by default (can be reenabled with webInterface = true)
  • Use socket-based activation by default.

@matthewbauer matthewbauer requested a review from worldofpeace Jul 18, 2019

@worldofpeace

This comment has been minimized.

@matthewbauer

This comment has been minimized.

Copy link
Member Author

commented Jul 18, 2019

GNOME Control Center uses CUPS_DATADIR

Oops! That is what print-manager uses as well, I had it mispelled here

@matthewbauer matthewbauer force-pushed the matthewbauer:cups-fixes branch from a49bf4f to ac44ef4 Jul 19, 2019

@matthewbauer matthewbauer force-pushed the matthewbauer:cups-fixes branch from ac44ef4 to 9a0197a Aug 9, 2019

@matthewbauer

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2019

Updated to keep the webInterface default.

@worldofpeace
Copy link
Member

left a comment

Looks great 👍

I've yet to test it.

@matthewbauer

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2019

@GrahamcOfBorg test printing

@matthewbauer

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2019

Tests are broken, need to rework it.

matthewbauer added some commits Jul 18, 2019

nixos/cupsd: Set CUPS_DATADIR globally
This is used by some programs that need CUPS data files. For instance,
print-manager looks here for printing test pages.
nixos/cupsd: only enable cups when startWhenNeeded = false
cups-browsed was pulling in cups.service even when we were using the
socket-based initialization.
nixos/cupsd: include /run/cups/cups.sock in ListenStreams
This socket should always be created by systemd.
nixos/cupsd: use socket-based activation by default
Make socket-based activation the
default (services.printing.startWhenNeeded)
tests/printing: don’t wait for unit services
These are now socket activated, we don’t need it to start up front.

@matthewbauer matthewbauer force-pushed the matthewbauer:cups-fixes branch from 8cea6ca to e9b7085 Aug 14, 2019

@matthewbauer matthewbauer merged commit 1af546a into NixOS:master Aug 14, 2019

1 check was pending

grahamcofborg-eval Checking original out paths
Details

@ofborg ofborg bot added the 6.topic: printing label Aug 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.