summary refs log tree commit diff
diff options
context:
space:
mode:
authorBob van der Linden <bobvanderlinden@gmail.com>2018-12-19 22:51:36 +0100
committerBob van der Linden <bobvanderlinden@gmail.com>2019-03-24 21:15:30 +0100
commit0cf1944c36de87a3fb231adec090bea595092f94 (patch)
tree7c8a1f0341ff511b6ec8a793d16443dd2a132e81
parent323e8ef37549c2cff1412c384858fc6e78d64c1c (diff)
downloadnixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.tar
nixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.tar.gz
nixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.tar.bz2
nixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.tar.lz
nixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.tar.xz
nixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.tar.zst
nixpkgs-0cf1944c36de87a3fb231adec090bea595092f94.zip
nixos/cups: /var/run -> /run
-rw-r--r--nixos/modules/services/printing/cupsd.nix2
-rw-r--r--nixos/tests/printing.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 854c76cc0a1..9e9bdedff12 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -74,7 +74,7 @@ let
     ${concatMapStrings (addr: ''
       Listen ${addr}
     '') 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
 
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index f009a7c706e..e8702c1ffbf 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -42,7 +42,7 @@ import ./make-test.nix ({pkgs, ... }: {
       # 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;
+      $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die;
       # Test that HTTP server is available too.
       $client->succeed("curl --fail http://localhost:631/");
       $client->succeed("curl --fail http://server:631/");