public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/cups: /var/run -> /run

Browse Source
This commit is contained in:
Bob van der Linden 2018-12-19 22:51:36 +01:00
parent 323e8ef375
commit 0cf1944c36
No known key found for this signature in database
GPG Key ID: 2A90361F99CF1795
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ let
${concatMapStrings (addr: '' ${concatMapStrings (addr: ''
Listen ${addr} Listen ${addr}
'') cfg.listenAddresses} '') cfg.listenAddresses}
Listen /var/run/cups/cups.sock Listen /run/cups/cups.sock
SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin

2
nixos/tests/printing.nix
View File

@ -42,7 +42,7 @@ import ./make-test.nix ({pkgs, ... }: {
# check local encrypted connections work without error # check local encrypted connections work without error
$client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die;
# Test that UNIX socket is used for connections. # Test that UNIX socket is used for connections.
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die;
# Test that HTTP server is available too. # Test that HTTP server is available too.
$client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://localhost:631/");
$client->succeed("curl --fail http://server:631/"); $client->succeed("curl --fail http://server:631/");