Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Revert "cups service: fix client sockets"

This reverts commit cf4c07734364e7e59414f486381360b42a9f88ea.

+3 -8
+2 -5
nixos/modules/services/printing/cupsd.nix
··· 124 125 listenAddresses = mkOption { 126 type = types.listOf types.str; 127 - default = [ "localhost:631" ]; 128 example = [ "*:631" ]; 129 description = '' 130 A list of addresses and ports on which to listen. ··· 321 ''} 322 ''; 323 324 - serviceConfig = { 325 - PrivateTmp = true; 326 - RuntimeDirectory = [ "cups" ]; 327 - }; 328 }; 329 330 systemd.services.cups-browsed = mkIf avahiEnabled
··· 124 125 listenAddresses = mkOption { 126 type = types.listOf types.str; 127 + default = [ "127.0.0.1:631" ]; 128 example = [ "*:631" ]; 129 description = '' 130 A list of addresses and ports on which to listen. ··· 321 ''} 322 ''; 323 324 + serviceConfig.PrivateTmp = true; 325 }; 326 327 systemd.services.cups-browsed = mkIf avahiEnabled
+1 -3
nixos/tests/printing.nix
··· 39 $client->waitForUnit("cups.service"); 40 $client->sleep(10); # wait until cups is fully initialized 41 $client->succeed("lpstat -r") =~ /scheduler is running/ or die; 42 - # Test that UNIX socket is used for connections. 43 - $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; 44 - # Test that HTTP server is available too. 45 $client->succeed("curl --fail http://localhost:631/"); 46 $client->succeed("curl --fail http://server:631/"); 47 $server->fail("curl --fail --connect-timeout 2 http://client:631/");
··· 39 $client->waitForUnit("cups.service"); 40 $client->sleep(10); # wait until cups is fully initialized 41 $client->succeed("lpstat -r") =~ /scheduler is running/ or die; 42 + $client->succeed("lpstat -H") =~ "localhost:631" or die; 43 $client->succeed("curl --fail http://localhost:631/"); 44 $client->succeed("curl --fail http://server:631/"); 45 $server->fail("curl --fail --connect-timeout 2 http://client:631/");