seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2026-04-04 08:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: seasharp:879f4aef54be480fbe5fedda34ec208e129ac8d2
Branches Tags
seasharp:trunk
seasharp:keyring
..
compare: seasharp:36eeac3b859048352d9f32c8b84f5ebbc0fd1a66
Branches Tags
seasharp:trunk
seasharp:keyring

No commits in common. "879f4aef54be480fbe5fedda34ec208e129ac8d2" and "36eeac3b859048352d9f32c8b84f5ebbc0fd1a66" have entirely different histories.
879f4aef54 ... 36eeac3b85

2 changed files with 5 additions and 17 deletions
Show Stats Expand all files Collapse all files

4
modules/rosenthal/packages/networking.scm
View File

@ -15,7 +15,7 @@
(define-public cloudflared (define-public cloudflared
(package (package
(name "cloudflared") (name "cloudflared")
(version "2025.4.2") (version "2025.4.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -27,7 +27,7 @@
;; (snippet '(delete-file-recursively "vendor")) ;; (snippet '(delete-file-recursively "vendor"))
(sha256 (sha256
(base32 (base32
"0mblq1zvl7722k3515yc99ym18li39anlcmj8s10m7kkp9yfc596")))) "03bhkd5cgrw2srgh82xv1y95zkpx4v2rqdy9azhv4y7fzz07p89w"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.23 (list #:go go-1.23

18
modules/rosenthal/services/child-error.scm
View File

@ -127,8 +127,6 @@
;; ;;
(define-maybe string)
(define-configuration cloudflare-tunnel-configuration (define-configuration cloudflare-tunnel-configuration
(cloudflared (cloudflared
(file-like cloudflared) (file-like cloudflared)
@ -150,11 +148,8 @@ headers. This can expose sensitive information in your logs.")
;; Subcommand options ;; Subcommand options
(token (token
maybe-string (string "")
"The Tunnel token.") "The Tunnel token.")
(token-file
maybe-string
"Secert file for the Tunnel token.")
(extra-options (extra-options
(list-of-strings '()) (list-of-strings '())
"List of extra options.") "List of extra options.")
@ -163,7 +158,7 @@ headers. This can expose sensitive information in your logs.")
(define cloudflare-tunnel-shepherd-service (define cloudflare-tunnel-shepherd-service
(match-record-lambda <cloudflare-tunnel-configuration> (match-record-lambda <cloudflare-tunnel-configuration>
(cloudflared log-level log-file extra-tunnel-options (cloudflared log-level log-file extra-tunnel-options
token token-file extra-options) token extra-options)
(list (shepherd-service (list (shepherd-service
(documentation "Run cloudflared.") (documentation "Run cloudflared.")
(provision '(cloudflare-tunnel)) (provision '(cloudflare-tunnel))
@ -180,14 +175,7 @@ headers. This can expose sensitive information in your logs.")
#:group "nogroup" #:group "nogroup"
#:log-file #$log-file #:log-file #$log-file
#:environment-variables #:environment-variables
(list #$@(if (maybe-value-set? token) (list (format #f "TUNNEL_TOKEN=~a" #$token))))
(list (format #f "TUNNEL_TOKEN=~a"
token))
'())
#$@(if (maybe-value-set? token-file)
(list (format #f "TUNNEL_TOKEN_FILE=~a"
token-file))
'()))))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define cloudflare-tunnel-service-type (define cloudflare-tunnel-service-type