diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-07-31 18:22:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-08-01 00:02:03 +0200 |
| commit | bfe3fdbc75a1412ccac46fc2ca750fa42e7f70fe (patch) | |
| tree | 1915da4619b5e7fb7f48e8b90c25ed6b444dae14 /gnu/services | |
| parent | 7c1010f3261fcb74ab9b7702f59443ad89031a2f (diff) | |
services: tor: Do not write to /var/log/tor.log.
The service uses syslog and additionally shepherd 0.9 captures its
stdout/stderr, so there's no point in passing #:log-file.
* gnu/services/networking.scm (tor-shepherd-service): Remove #:log-file
argument to 'make-forkexec-constructor'.
(%tor-log-rotation): Remove.
(tor-service-type): Remove ROTTLOG-SERVICE-TYPE extension.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/networking.scm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b555c460408..3ddcdcc251d 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm | |||
| @@ -997,15 +997,10 @@ HiddenServicePort ~a ~a~%" | |||
| 997 | ;; 'sd_notify' though), so we're stuck with that. | 997 | ;; 'sd_notify' though), so we're stuck with that. |
| 998 | (start #~(make-forkexec-constructor | 998 | (start #~(make-forkexec-constructor |
| 999 | (list #$tor "-f" #$torrc) | 999 | (list #$tor "-f" #$torrc) |
| 1000 | #:user "tor" #:group "tor" | 1000 | #:user "tor" #:group "tor")) |
| 1001 | #:log-file "/var/log/tor.log")) | ||
| 1002 | (stop #~(make-kill-destructor)) | 1001 | (stop #~(make-kill-destructor)) |
| 1003 | (documentation "Run the Tor anonymous network overlay.")))))))) | 1002 | (documentation "Run the Tor anonymous network overlay.")))))))) |
| 1004 | 1003 | ||
| 1005 | (define %tor-log-rotation | ||
| 1006 | (list (log-rotation | ||
| 1007 | (files '("/var/log/tor.log"))))) | ||
| 1008 | |||
| 1009 | (define (tor-activation config) | 1004 | (define (tor-activation config) |
| 1010 | "Set up directories for Tor and its hidden services, if any." | 1005 | "Set up directories for Tor and its hidden services, if any." |
| 1011 | #~(begin | 1006 | #~(begin |
| @@ -1051,9 +1046,7 @@ HiddenServicePort ~a ~a~%" | |||
| 1051 | (service-extension account-service-type | 1046 | (service-extension account-service-type |
| 1052 | (const %tor-accounts)) | 1047 | (const %tor-accounts)) |
| 1053 | (service-extension activation-service-type | 1048 | (service-extension activation-service-type |
| 1054 | tor-activation) | 1049 | tor-activation))) |
| 1055 | (service-extension rottlog-service-type | ||
| 1056 | (const %tor-log-rotation)))) | ||
| 1057 | 1050 | ||
| 1058 | ;; This can be extended with hidden services. | 1051 | ;; This can be extended with hidden services. |
| 1059 | (compose concatenate) | 1052 | (compose concatenate) |
