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

Revert "cups service: fix client sockets"

Browse Source 
This reverts commit cf4c077343.
This commit is contained in:
Nikolay Amiantov 2018-02-23 18:47:43 +03:00
parent dccf85a354
commit cc52eff6c6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ in
listenAddresses = mkOption { listenAddresses = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ "localhost:631" ]; default = [ "127.0.0.1:631" ];
example = [ "*:631" ]; example = [ "*:631" ];
description = '' description = ''
A list of addresses and ports on which to listen. A list of addresses and ports on which to listen.
@ -321,10 +321,7 @@ in
''} ''}
''; '';
serviceConfig = { serviceConfig.PrivateTmp = true;
PrivateTmp = true;
RuntimeDirectory = [ "cups" ];
};
}; };
systemd.services.cups-browsed = mkIf avahiEnabled systemd.services.cups-browsed = mkIf avahiEnabled

4
nixos/tests/printing.nix
View File

@ -39,9 +39,7 @@ import ./make-test.nix ({pkgs, ... }: {
$client->waitForUnit("cups.service"); $client->waitForUnit("cups.service");
$client->sleep(10); # wait until cups is fully initialized $client->sleep(10); # wait until cups is fully initialized
$client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
# Test that UNIX socket is used for connections. $client->succeed("lpstat -H") =~ "localhost:631" or die;
$client->succeed("lpstat -H") =~ "/var/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://localhost:631/");
$client->succeed("curl --fail http://server:631/"); $client->succeed("curl --fail http://server:631/");
$server->fail("curl --fail --connect-timeout 2 http://client:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/");