services: cloudflare-tunnel-shepherd-service: Inline tunnel options.

* rosenthal/services/child-error.scm (cloudflare-tunnel-shepherd-service): Inline tunnel-options.
2 years ago · abeacc8731
parent 6f168bc772
commit abeacc8731
1 changed files with 25 additions and 21 deletions
--- a/rosenthal/services/child-error.scm
+++ b/rosenthal/services/child-error.scm
@ -80,16 +80,20 @@ 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
+                      (list #$cloudflared
+                            "tunnel"
+                            "--no-autoupdate"
+                            "--metrics" #$metrics
+                            "--loglevel" #$log-level
                            #$@extra-tunnel-options
-                              "run" "--token" #$token
+
+                            "run"
+                            "--token" #$token
                            #$@(if http2-origin?
                                   '("--http2-origin")
                                   '())
@ -100,7 +104,7 @@ headers.  This can expose sensitive information in your logs.")
                      #:user "cloudflared"
                      #:group "cloudflared"
                      #:log-file #$log-file))
-              (stop #~(make-kill-destructor))))))))
+            (stop #~(make-kill-destructor)))))))

 (define cloudflare-tunnel-service-type
  (service-type