From 3bcb305b98e02f6c9d98e7325813fc00f18f0e6c Mon Sep 17 00:00:00 2001
From: Chris Marusich <cmmarusich@gmail.com>
Date: Tue, 31 Jul 2018 01:13:48 -0700
Subject: 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.
---
 gnu/tests/networking.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'gnu/tests/networking.scm')

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 @@ (define %tor-os/unix-socks-socket
   (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
-- 
cgit v1.2.3

commit/etc/completion?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>commit</a><a href='/guix/diff/etc/completion?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/completion'>
<input type='hidden' name='id' value='467485a50a4a7261c245d36bc0778445ccc4d7f9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>root</a>/<a href='/guix/log/etc?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>etc</a>/<a href='/guix/log/etc/completion?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>completion</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/completion?id=467485a50a4a7261c245d36bc0778445ccc4d7f9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-08 21:09:55 +0100'>2021-12-08</span></td><td><a href='/guix/commit/etc/completion?id=f3af1fb0bcbcbe18ab773374efe606e90107cfb6'>bash completion: Complete ‘guix shell -f’.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-31 00:57:07 +0200'>2021-10-31</span></td><td><a href='/guix/commit/etc/completion?id=8e6989fcaf4a6de00e799777e2a0ccb90fc05e59'>bash completion: Complete top-level options.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-31 00:57:07 +0200'>2021-10-31</span></td><td><a href='/guix/commit/etc/completion?id=0987a0eba4e8220e98e93686a4ad3ef87433fb2f'>bash completion: Don't hard-code "guix" binary name.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-25 18:58:18 +0200'>2021-10-25</span></td><td><a href='/guix/commit/etc/completion?id=80edb7df6586464aa40e84e103f0045452de95db'>Add 'guix shell'.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-10-24 20:17:05 +0200'>2021-10-24</span></td><td><a href='/guix/commit/etc/completion?id=55f6d9e818512b4e3e4adacfa99deb201b6854be'>etc: completion: Filter gratuitous spaces from available packages.</a></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2021-10-03 19:23:49 +0200'>2021-10-03</span></td><td><a href='/guix/commit/etc/completion?id=ed14bc298470f77f4ffacdc315ae87939f81c765'>bash completion: Fix ‘system’ &amp; ‘container’ subcommands.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-03 19:23:49 +0200'>2021-10-03</span></td><td><a href='/guix/commit/etc/completion?id=d71cfaea3006bc02dc6d309d916809e1f799f04e'>bash completion: Complete ‘guix size’ file names.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-03 19:23:48 +0200'>2021-10-03</span></td><td><a href='/guix/commit/etc/completion?id=9e3355d2a35796276d17af13ac45814dbf6c4203'>bash completion: Complete ‘guix build’ file names.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-03 19:23:48 +0200'>2021-10-03</span></td><td><a href='/guix/commit/etc/completion?id=ee5e4779e21b6eaf3229ab4201e731d8dde7e4b2'>bash completion: Complete ‘guix weather’ packages.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-03 19:23:48 +0200'>2021-10-03</span></td><td><a href='/guix/commit/etc/completion?id=17f76b209ceca9972dcd375d2a0f869abc6d1f26'>bash completion: Append to $COMPREPLY where possible.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-03 19:23:48 +0200'>2021-10-03</span></td><td><a href='/guix/commit/etc/completion?id=6fba67df1928a62abc7939bd8ff020e998ad8d6b'>bash completion: Consolidate similar $command ‘if’ branches.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-08-28 17:57:50 +0200'>2021-08-28</span></td><td><a href='/guix/commit/etc/completion?id=a8dd285d5a0670abf124a721e6ba94da045b24ba'>zsh completion: Add missing commands and arguments.</a></td><td>Noah Evans</td></tr>
<tr><td><span title='2021-06-16 12:13:39 +0200'>2021-06-16</span></td><td><a href='/guix/commit/etc/completion?id=fa0dc1229c0dc44a7358d183e54d9e02d1199e39'>bash_completion: Complete options for ‘guix environment’.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-06-16 12:13:39 +0200'>2021-06-16</span></td><td><a href='/guix/commit/etc/completion?id=dc3ba8c83602d69294e21d1b0c066f0d89890b56'>bash completion: Complete options for the right command.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-06-16 12:13:39 +0200'>2021-06-16</span></td><td><a href='/guix/commit/etc/completion?id=80a17aae7991c6df061a98bb71734485f4ca17e2'>bash completion: Really support subcommands.</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-04-20 12:13:16 +0200'>2021-04-20</span></td><td><a href='/guix/commit/etc/completion?id=d95168321f4a9bf6857b598da0a183b45a868d54'>import: Remove Nix importer.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-02-17 10:52:28 +0100'>2021-02-17</span></td><td><a href='/guix/commit/etc/completion?id=ee2a5da80a9bda25542c00a7a35a9ddddcbd58af'>scripts: system: Remove 'vm-image' command.</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-12-04 23:45:08 +0100'>2020-12-04</span></td><td><a href='/guix/commit/etc/completion?id=611ae310f4ca1d93600c280e940a69b07e20c350'>bash completion: Complete file names after '-f' and '-l'.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-24 17:53:02 +0200'>2020-09-24</span></td><td><a href='/guix/commit/etc/completion?id=8e0c5033b17fcf1e4596ee9a3d52157900acc6fa'>bash completion: Adjust to new 'guix help' output.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-21 23:33:49 +0200'>2020-09-21</span></td><td><a href='/guix/commit/etc/completion?id=92951bf46c42021f6f6521839c9c4ff2f88b8386'>bash completion: Complete file names after 'guix package -p'.</a></td><td>Fulbert</td></tr>
<tr><td><span title='2020-09-10 12:27:24 +0200'>2020-09-10</span></td><td><a href='/guix/commit/etc/completion?id=2ba81afcc204024255ce548e2c4cc4aed5541093'>bash completion: Restore completion for 'guix system', etc.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-06-27 23:42:20 +0200'>2020-06-27</span></td><td><a href='/guix/commit/etc/completion?id=4b4f890cb03d7c5b958fe08553dfad2f39a1d4f2'>bash completion: Complete 'guix environment' properly.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-06-04 23:26:43 +0200'>2020-06-04</span></td><td><a href='/guix/commit/etc/completion?id=538ca8dd65f0075cc65bcca18ed87f66a789290a'>bash completion: Complete sub-commands after 'guix time-machine'.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-06-04 23:26:43 +0200'>2020-06-04</span></td><td><a href='/guix/commit/etc/completion?id=b7bb381ba3740d33652c2a8e7772c17b93b259cc'>bash completion: Complete file names after '-p' and '-C'.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-13 09:30:26 +0300'>2020-05-13</span></td><td><a href='/guix/commit/etc/completion?id=3c986a7dc268756c097212de958f046b29b76c1b'>mailmap: Update entries for Nikita.</a></td><td>nikita</td></tr>
<tr><td><span title='2020-02-14 17:49:26 +0100'>2020-02-14</span></td><td><a href='/guix/commit/etc/completion?id=11415d35064cdba5cec1139aede18099cfa14547'>guix build: Add '--manifest' option.</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-11-26 00:16:36 +0100'>2019-11-26</span></td><td><a href='/guix/commit/etc/completion?id=dc209d5a5ddba4320c9a4f893d6df4b70f3685a0'>guix build, daemon: Rename "--no-build-hook" to "--no-offload".</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-29 10:13:44 +0200'>2019-04-29</span></td><td><a href='/guix/commit/etc/completion?id=d824cfbabeb0780c9ea7a6dab02c47b6a4d029c6'>guix package: Add 'install', 'remove', and 'upgrade' aliases.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-18 15:05:08 +0100'>2019-03-18</span></td><td><a href='/guix/commit/etc/completion?id=47956fa0c24efcdcba3493f0231c30e9a39ec7df'>Correct name and email address for ng0.</a></td><td>ng0</td></tr>
<tr><td><span title='2018-11-06 00:04:11 +0100'>2018-11-06</span></td><td><a href='/guix/commit/etc/completion?id=7082873ea2771ebef900333e0fa7468d6395f330'>bash completion: Restore completion of available packages for 'guix build'.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-07-03 06:58:51 +0300'>2018-07-03</span></td><td><a href='/guix/commit/etc/completion?id=3a15d0aa9c55881ddc3a21570350a743c28a6c92'>bash completion: Complete files names after 'guix weather -m'.</a></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2018-07-03 06:58:51 +0300'>2018-07-03</span></td><td><a href='/guix/commit/etc/completion?id=9b0a755f642542dd96065ad05ec9d844d8077fd7'>bash completion: Complete files names after 'guix build -L'.</a></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2018-06-16 21:23:11 +0300'>2018-06-16</span></td><td><a href='/guix/commit/etc/completion?id=bba0fa2499eefab02cacfed9958dc498abfd484d'>Add guix-daemon Bash completion file.</a></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2018-03-20 17:17:58 +0100'>2018-03-20</span></td><td><a href='/guix/commit/etc/completion?id=4a78fd4617908546be15d2c101f5cab512c71f8e'>Correct name and Email for ng0.</a></td><td>ng0</td></tr>
<tr><td><span title='2018-02-17 22:23:07 +0300'>2018-02-17</span></td><td><a href='/guix/commit/etc/completion?id=f5f916792c7069a22d95c5b7c68bcf3bbb86e451'>bash completion: Complete files names after 'guix package -m'.</a></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2018-01-16 16:00:20 +0100'>2018-01-16</span></td><td><a href='/guix/commit/etc/completion?id=b83fc85f9f40d9a5dff5b0d3ef38c1b93bd4c7e3'>etc: Add completions for fish.</a></td><td>ng0</td></tr>