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.
This commit is contained in:
		
							parent
							
								
									7c1010f326
								
							
						
					
					
						commit
						bfe3fdbc75
					
				
					 1 changed files with 2 additions and 9 deletions
				
			
		| 
						 | 
					@ -997,15 +997,10 @@ HiddenServicePort ~a ~a~%"
 | 
				
			||||||
                ;; 'sd_notify' though), so we're stuck with that.
 | 
					                ;; 'sd_notify' though), so we're stuck with that.
 | 
				
			||||||
                (start #~(make-forkexec-constructor
 | 
					                (start #~(make-forkexec-constructor
 | 
				
			||||||
                          (list #$tor "-f" #$torrc)
 | 
					                          (list #$tor "-f" #$torrc)
 | 
				
			||||||
                          #:user "tor" #:group "tor"
 | 
					                          #:user "tor" #:group "tor"))
 | 
				
			||||||
                          #:log-file "/var/log/tor.log"))
 | 
					 | 
				
			||||||
                (stop #~(make-kill-destructor))
 | 
					                (stop #~(make-kill-destructor))
 | 
				
			||||||
                (documentation "Run the Tor anonymous network overlay."))))))))
 | 
					                (documentation "Run the Tor anonymous network overlay."))))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define %tor-log-rotation
 | 
					 | 
				
			||||||
  (list (log-rotation
 | 
					 | 
				
			||||||
         (files '("/var/log/tor.log")))))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
(define (tor-activation config)
 | 
					(define (tor-activation config)
 | 
				
			||||||
  "Set up directories for Tor and its hidden services, if any."
 | 
					  "Set up directories for Tor and its hidden services, if any."
 | 
				
			||||||
  #~(begin
 | 
					  #~(begin
 | 
				
			||||||
| 
						 | 
					@ -1051,9 +1046,7 @@ HiddenServicePort ~a ~a~%"
 | 
				
			||||||
                       (service-extension account-service-type
 | 
					                       (service-extension account-service-type
 | 
				
			||||||
                                          (const %tor-accounts))
 | 
					                                          (const %tor-accounts))
 | 
				
			||||||
                       (service-extension activation-service-type
 | 
					                       (service-extension activation-service-type
 | 
				
			||||||
                                          tor-activation)
 | 
					                                          tor-activation)))
 | 
				
			||||||
                       (service-extension rottlog-service-type
 | 
					 | 
				
			||||||
                                          (const %tor-log-rotation))))
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
                ;; This can be extended with hidden services.
 | 
					                ;; This can be extended with hidden services.
 | 
				
			||||||
                (compose concatenate)
 | 
					                (compose concatenate)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue