amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: tor: add auto-start?

Browse source 
* gnu/services/networking.scm (tor-configuration): Add `auto-start?' field.
Fix indent.
* doc/guix.texi (tor-configuration): Document this.

Change-Id: I9339291e3329d615550f97e9cc0f0d773f0d1c51
Reviewed-by: André Batista <nandre@riseup.net>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Zacchaeus 2025-07-12 00:20:40 -07:00 • committed by Sharlatan Hellseher
parent 6768e33bcc
commit 16dbd20852
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/guix.texi
View file

@ -23231,6 +23231,9 @@ For any transport plugin you include in this list, appropriate
configuration line to enable transport plugin will be automatically configuration line to enable transport plugin will be automatically
added to the default configuration file. added to the default configuration file.
@item @code{auto-start?} (default: @code{#t})
Whether or not to start the Tor daemon on boot.
@end table @end table
@end deftp @end deftp

7
gnu/services/networking.scm
View file

@ -187,6 +187,7 @@
tor-configuration-socks-socket-type tor-configuration-socks-socket-type
tor-configuration-control-socket-path tor-configuration-control-socket-path
tor-configuration-transport-plugins tor-configuration-transport-plugins
tor-configuration-auto-start
tor-onion-service-configuration tor-onion-service-configuration
tor-onion-service-configuration? tor-onion-service-configuration?
tor-onion-service-configuration-name tor-onion-service-configuration-name
@ -1171,7 +1172,9 @@ applications in communication. It is used by Jami, for example.")))
(control-socket? tor-configuration-control-socket-path (control-socket? tor-configuration-control-socket-path
(default #f)) (default #f))
(transport-plugins tor-configuration-transport-plugins (transport-plugins tor-configuration-transport-plugins
(default '()))) (default '()))
(auto-start? tor-configuration-auto-start
(default #t)))
(define %tor-accounts (define %tor-accounts
;; User account and groups for Tor. ;; User account and groups for Tor.
@ -1284,6 +1287,7 @@ HiddenServicePort ~a ~a~%"
"Return a <shepherd-service> running Tor." "Return a <shepherd-service> running Tor."
(let* ((torrc (tor-configuration->torrc config)) (let* ((torrc (tor-configuration->torrc config))
(transport-plugins (tor-configuration-transport-plugins config)) (transport-plugins (tor-configuration-transport-plugins config))
(auto-start? (tor-configuration-auto-start config))
(tor (least-authority-wrapper (tor (least-authority-wrapper
(file-append (tor-configuration-tor config) "/bin/tor") (file-append (tor-configuration-tor config) "/bin/tor")
#:name "tor" #:name "tor"
@ -1320,6 +1324,7 @@ HiddenServicePort ~a ~a~%"
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$tor "-f" #$torrc) (list #$tor "-f" #$torrc)
#:user "tor" #:group "tor")) #:user "tor" #:group "tor"))
(auto-start? auto-start?)
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
(actions (list (shepherd-configuration-action torrc))) (actions (list (shepherd-configuration-action torrc)))
(documentation "Run the Tor anonymous network overlay."))))) (documentation "Run the Tor anonymous network overlay.")))))