Merge pull request #55517 from florianjacob/cups-fix-ssl-dir
nixos/cups: Fix Unable to encrypt connection:
This commit is contained in:
commit
b1bda29f5c
@ -316,6 +316,10 @@ in
|
||||
mkdir -m 0755 -p ${cfg.tempDir}
|
||||
|
||||
mkdir -m 0755 -p /var/lib/cups
|
||||
# While cups will automatically create self-signed certificates if accessed via TLS,
|
||||
# this directory to store the certificates needs to be created manually.
|
||||
mkdir -m 0700 -p /var/lib/cups/ssl
|
||||
|
||||
# Backwards compatibility
|
||||
if [ ! -L /etc/cups ]; then
|
||||
mv /etc/cups/* /var/lib/cups
|
||||
|
@ -39,6 +39,8 @@ import ./make-test.nix ({pkgs, ... }: {
|
||||
$client->waitForUnit("cups.service");
|
||||
$client->sleep(10); # wait until cups is fully initialized
|
||||
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
|
||||
# check local encrypted connections work without error
|
||||
$client->succeed("lpstat -E -r") =~ /scheduler is running/ or die;
|
||||
# Test that UNIX socket is used for connections.
|
||||
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
|
||||
# Test that HTTP server is available too.
|
||||
|
Loading…
Reference in New Issue
Block a user