From abeacc8731fc869013362ba1c7fabc9305f9b905 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Thu, 1 Dec 2022 23:02:20 +0800
Subject: [PATCH] services: cloudflare-tunnel-shepherd-service: Inline tunnel
 options.

* rosenthal/services/child-error.scm (cloudflare-tunnel-shepherd-service):
Inline tunnel-options.
---
 rosenthal/services/child-error.scm | 46 ++++++++++++++++--------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/rosenthal/services/child-error.scm b/rosenthal/services/child-error.scm
index 67f8ccf..32628be 100644
--- a/rosenthal/services/child-error.scm
+++ b/rosenthal/services/child-error.scm
@@ -80,27 +80,31 @@ headers.  This can expose sensitive information in your logs.")
                                           extra-tunnel-options
                                           token http2-origin? post-quantum?
                                           extra-options)
-     (let ((tunnel-options
-            (list "--no-autoupdate" "--metrics" metrics "--loglevel" log-level)))
-       (list (shepherd-service
-              (documentation "Run cloudflared.")
-              (provision '(cloudflare-tunnel))
-              (requirement '(networking))
-              (start #~(make-forkexec-constructor
-                        (list #$cloudflared "tunnel" #$@tunnel-options
-                              #$@extra-tunnel-options
-                              "run" "--token" #$token
-                              #$@(if http2-origin?
-                                     '("--http2-origin")
-                                     '())
-                              #$@(if post-quantum?
-                                     '("--post-quantum")
-                                     '())
-                              #$@extra-options)
-                        #:user "cloudflared"
-                        #:group "cloudflared"
-                        #:log-file #$log-file))
-              (stop #~(make-kill-destructor))))))))
+     (list (shepherd-service
+            (documentation "Run cloudflared.")
+            (provision '(cloudflare-tunnel))
+            (requirement '(networking))
+            (start #~(make-forkexec-constructor
+                      (list #$cloudflared
+                            "tunnel"
+                            "--no-autoupdate"
+                            "--metrics" #$metrics
+                            "--loglevel" #$log-level
+                            #$@extra-tunnel-options
+
+                            "run"
+                            "--token" #$token
+                            #$@(if http2-origin?
+                                   '("--http2-origin")
+                                   '())
+                            #$@(if post-quantum?
+                                   '("--post-quantum")
+                                   '())
+                            #$@extra-options)
+                      #:user "cloudflared"
+                      #:group "cloudflared"
+                      #:log-file #$log-file))
+            (stop #~(make-kill-destructor)))))))
 
 (define cloudflare-tunnel-service-type
   (service-type