services: tor: Remove unnecessary modules from shepherd environment.
This is a followup to fb868cd779.
* gnu/services/networking.scm (tor-shepherd-service): Remove unused
'with-imported-modules' and 'modules' field.
			
			
This commit is contained in:
		
							parent
							
								
									8b56983999
								
							
						
					
					
						commit
						2a358911b0
					
				
					 1 changed files with 16 additions and 22 deletions
				
			
		| 
						 | 
					@ -1011,9 +1011,6 @@ HiddenServicePort ~a ~a~%"
 | 
				
			||||||
                                      (source torrc)
 | 
					                                      (source torrc)
 | 
				
			||||||
                                      (target source)))
 | 
					                                      (target source)))
 | 
				
			||||||
                    #:namespaces (delq 'net %namespaces))))
 | 
					                    #:namespaces (delq 'net %namespaces))))
 | 
				
			||||||
       (with-imported-modules (source-module-closure
 | 
					 | 
				
			||||||
                               '((gnu build shepherd)
 | 
					 | 
				
			||||||
                                 (gnu system file-systems)))
 | 
					 | 
				
			||||||
       (list (shepherd-service
 | 
					       (list (shepherd-service
 | 
				
			||||||
              (provision '(tor))
 | 
					              (provision '(tor))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1021,9 +1018,6 @@ HiddenServicePort ~a ~a~%"
 | 
				
			||||||
              ;; dependency on 'loopback'.
 | 
					              ;; dependency on 'loopback'.
 | 
				
			||||||
              (requirement '(user-processes loopback syslogd))
 | 
					              (requirement '(user-processes loopback syslogd))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                (modules '((gnu build shepherd)
 | 
					 | 
				
			||||||
                           (gnu system file-systems)))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
              ;; XXX: #:pid-file won't work because the wrapped 'tor'
 | 
					              ;; XXX: #:pid-file won't work because the wrapped 'tor'
 | 
				
			||||||
              ;; program would print its PID within the user namespace
 | 
					              ;; program would print its PID within the user namespace
 | 
				
			||||||
              ;; instead of its actual PID outside.  There's no inetd or
 | 
					              ;; instead of its actual PID outside.  There's no inetd or
 | 
				
			||||||
| 
						 | 
					@ -1034,7 +1028,7 @@ HiddenServicePort ~a ~a~%"
 | 
				
			||||||
                        #:user "tor" #:group "tor"))
 | 
					                        #:user "tor" #:group "tor"))
 | 
				
			||||||
              (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.")))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(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."
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue