tjh.dev
Revert "cups service: fix client sockets"
This reverts commit cf4c07734364e7e59414f486381360b42a9f88ea.
+2
-5
nixos/modules/services/printing/cupsd.nix
+2
-5
nixos/modules/services/printing/cupsd.nix
···
124
124
125
125
listenAddresses = mkOption {
126
126
type = types.listOf types.str;
127
-
default = [ "localhost:631" ];
127
+
default = [ "127.0.0.1:631" ];
128
128
example = [ "*:631" ];
129
129
description = ''
130
130
A list of addresses and ports on which to listen.
···
321
321
''}
322
322
'';
323
323
324
-
serviceConfig = {
325
-
PrivateTmp = true;
326
-
RuntimeDirectory = [ "cups" ];
327
-
};
324
+
serviceConfig.PrivateTmp = true;
328
325
};
329
326
330
327
systemd.services.cups-browsed = mkIf avahiEnabled
+1
-3
nixos/tests/printing.nix
+1
-3
nixos/tests/printing.nix
···
39
39
$client->waitForUnit("cups.service");
40
40
$client->sleep(10); # wait until cups is fully initialized
41
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.
42
+
$client->succeed("lpstat -H") =~ "localhost:631" or die;
45
43
$client->succeed("curl --fail http://localhost:631/");
46
44
$client->succeed("curl --fail http://server:631/");
47
45
$server->fail("curl --fail --connect-timeout 2 http://client:631/");