summaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorChris Marusich <cmmarusich@gmail.com>2018-07-31 01:13:48 -0700
committerChris Marusich <cmmarusich@gmail.com>2018-08-28 00:25:05 -0700
commit3bcb305b98e02f6c9d98e7325813fc00f18f0e6c (patch)
tree814beccc935b4a221074e6458ae2be9e9d2c377c /gnu/tests
parentb0f951e4f04766892933e3b60d1b24ab3a8589c2 (diff)
services: tor: Make it easier to use UNIX sockets.
* doc/guix.texi (Networking Services): Document it, and mention that tor-service is deprecated. * gnu/services/networking.scm (<tor-configuration>) <socks-socket-type>: New field. (tor-configuration->torrc): When socks-socket-type is 'unix, set SocksPort to UNIX domain socket /var/run/tor/socks-sock and set UnixSocksGroupWritable to 1. * gnu/tests/networking.scm (%tor-os/unix-socks-socket): Instead of using a custom config file, just set socks-socket-type to 'unix.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/networking.scm8
1 files changed, 1 insertions, 7 deletions
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index 7ca71f0c2c..381c5caf14 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -354,13 +354,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
(simple-operating-system
(service tor-service-type
(tor-configuration
- (config-file
- (plain-file "test-torrc"
- "\
-SocksPort unix:/var/run/tor/socks-sock
-UnixSocksGroupWritable 1
-")
- )))))
+ (socks-socket-type 'unix)))))
(define (run-tor-test)
(define os