diff options
author | Nikolay Amiantov <ab@fmap.me> | 2018-02-23 18:47:43 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2018-02-23 18:47:43 +0300 |
commit | cc52eff6c61d69441d4df0bbdac237346deac968 (patch) | |
tree | cfc6f161bd7b693c23b0467f2e8d95b031af804a /nixos | |
parent | dccf85a354dd3e65a9a6c2d630bdbd87fafa44ba (diff) | |
download | nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.tar nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.tar.gz nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.tar.bz2 nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.tar.lz nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.tar.xz nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.tar.zst nixpkgs-cc52eff6c61d69441d4df0bbdac237346deac968.zip |
Revert "cups service: fix client sockets"
This reverts commit cf4c07734364e7e59414f486381360b42a9f88ea.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/printing/cupsd.nix | 7 | ||||
-rw-r--r-- | nixos/tests/printing.nix | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df..4c7f58d1d8b 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -124,7 +124,7 @@ in listenAddresses = mkOption { type = types.listOf types.str; - default = [ "localhost:631" ]; + default = [ "127.0.0.1:631" ]; example = [ "*:631" ]; description = '' A list of addresses and ports on which to listen. @@ -321,10 +321,7 @@ in ''} ''; - serviceConfig = { - PrivateTmp = true; - RuntimeDirectory = [ "cups" ]; - }; + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 98900883061..2d3ecaf94cf 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,9 +39,7 @@ 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; - # 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. + $client->succeed("lpstat -H") =~ "localhost:631" or die; $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/"); |