From f42f8e258bca3ba2959979aaa90cb697ba6e027f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 2 Oct 2024 20:39:05 +0800 Subject: [PATCH] services: cloudflare-tunnel: Reduce configuration fields. * rosenthal/services/child-error.scm (cloudflare-tunnel-configuration) [metrics,http2-origin?,post-quantum?]: Remove fields. (cloudflare-tunnel-shepherd-service): Adjust accordingly. --- rosenthal/services/child-error.scm | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/rosenthal/services/child-error.scm b/rosenthal/services/child-error.scm index c099908..647cc9a 100644 --- a/rosenthal/services/child-error.scm +++ b/rosenthal/services/child-error.scm @@ -146,9 +146,6 @@ "The cloudflared executable.") ;; Tunnel options - (metrics - (string "localhost:") - "Listen address for metrics reporting.") (log-level (string "info") "Application logging level (@code{debug}, @code{info}, @code{warn}, @@ -166,12 +163,6 @@ headers. This can expose sensitive information in your logs.") (token (string "") "The Tunnel token.") - (http2-origin? - (boolean #f) - "Enable HTTP/2 origin servers.") - (post-quantum? - (boolean #f) - "Create an experimental post-quantum secure tunnel.") (extra-options (list-of-strings '()) "List of extra options.") @@ -183,8 +174,8 @@ headers. This can expose sensitive information in your logs.") (define cloudflare-tunnel-shepherd-service (match-record-lambda - (cloudflared metrics log-level log-file extra-tunnel-options - token http2-origin? post-quantum? extra-options) + (cloudflared log-level log-file extra-tunnel-options + token extra-options) (list (shepherd-service (documentation "Run cloudflared.") (provision '(cloudflare-tunnel)) @@ -193,17 +184,9 @@ headers. This can expose sensitive information in your logs.") (list #$(file-append cloudflared "/bin/cloudflared") "tunnel" "--no-autoupdate" - "--metrics" #$metrics "--loglevel" #$log-level #$@extra-tunnel-options - "run" - #$@(if http2-origin? - '("--http2-origin") - '()) - #$@(if post-quantum? - '("--post-quantum") - '()) #$@extra-options) #:user "nobody" #:group "nogroup"