[bug#54151] gnu: Add #:log-file option when starting openvpn shepherd services

[bug#54151] gnu: Add #:log-file option when starting openvpn shepherd services

[Cameron Chaparro]

[-- Attachment #1.1: Type: text/plain, Size: 461 bytes --]

I accidentally submitted this to bug-guix, first, sorry.

---------- Forwarded message ---------
From: Cameron Chaparro <cameron@cameronchaparro.com>
Date: Thu, Feb 24, 2022 at 4:11 PM
Subject: openvpn-shepherd-service is not writing log files
To: <bug-guix@gnu.org>

I noticed that the `openvpn-shepherd-service' is defining, but not
actually using, the log file when starting the client/server. I think
this patch should address that issue.

Cameron Chaparro

[-- Attachment #1.2: Type: text/html, Size: 854 bytes --]

[-- Attachment #2: 0001-gnu-Add-log-file-option-when-starting-openvpn-shephe.patch --]
[-- Type: text/x-patch, Size: 1425 bytes --]

From 372f3b8a2f2900bca5a55208a07940e6b70ddded Mon Sep 17 00:00:00 2001
Message-Id: <372f3b8a2f2900bca5a55208a07940e6b70ddded.1645740586.git.cameron@cameronchaparro.com>
From: Cameron Chaparro <cameron@cameronchaparro.com>
Date: Thu, 24 Feb 2022 15:49:15 -0600
Subject: [PATCH] gnu: Add #:log-file option when starting openvpn shepherd
 services

---
 gnu/services/vpn.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index 3e370ba4be..b24e9cffb3 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Nathan Dehnel <ncdehnel@gmail.com>
+;;; Copyright © 2022 Cameron V Chaparro <cameron@cameronchaparro.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -494,7 +495,8 @@ (define (openvpn-shepherd-service role)
                        (list (string-append #$openvpn "/sbin/openvpn")
                              "--writepid" #$pid-file "--config" #$config-file
                              "--daemon")
-                       #:pid-file #$pid-file))
+                       #:pid-file #$pid-file
+                       #:log-file #$log-file))
              (stop #~(make-kill-destructor)))))))
 
 (define %openvpn-accounts

base-commit: 979b6a2c55fab729923d76ac9fee027d5d2d8f2b
-- 
2.34.0

bug#54151: gnu: Add #:log-file option when starting openvpn shepherd services

[Ludovic Courtès]

Hi,

Cameron Chaparro <cameron@cameronchaparro.com> skribis:

> +++ b/gnu/services/vpn.scm
> @@ -9,6 +9,7 @@
>  ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
>  ;;; Copyright © 2021 jgart <jgart@dismail.de>
>  ;;; Copyright © 2021 Nathan Dehnel <ncdehnel@gmail.com>
> +;;; Copyright © 2022 Cameron V Chaparro <cameron@cameronchaparro.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -494,7 +495,8 @@ (define (openvpn-shepherd-service role)
>                         (list (string-append #$openvpn "/sbin/openvpn")
>                               "--writepid" #$pid-file "--config" #$config-file
>                               "--daemon")
> -                       #:pid-file #$pid-file))
> +                       #:pid-file #$pid-file
> +                       #:log-file #$log-file))
>               (stop #~(make-kill-destructor)))))))

I adjusted the commit log and applied it, thanks!

Ludo’.