seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-11-03 19:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

services: child-error: Remove unneeded user and groups.

Browse Source 
* rosenthal/services/child-error.scm (%cloudflare-tunnel-accounts): Deleted
variable.
(cloudflare-tunnel-shepherd-service)[start]: Change to `nobody` and `nogroup`.
(cloudflare-tunnel-service-type)[extensions]: Adjusted accordingly.
(%miniflux-accounts): Deleted `miniflux` group and use `nogroup` instead.
(miniflux-shepherd-service): Adjusted accordingly.
This commit is contained in:
Hilton Chain 2022-12-19 14:57:26 +08:00
parent 16a443b30d
commit 8181b7fb4e
No known key found for this signature in database
GPG Key ID: 5E5AA665614917F7
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rosenthal/services/child-error.scm
View File

@ -142,16 +142,6 @@ headers. This can expose sensitive information in your logs.")
(list-of-strings '()) (list-of-strings '())
"List of extra options.")) "List of extra options."))
(define %cloudflare-tunnel-accounts
(list (user-group (name "cloudflared") (system? #t))
(user-account
(name "cloudflared")
(group "cloudflared")
(system? #t)
(comment "Cloudflare Tunnel user")
(home-directory "/var/empty")
(shell (file-append shadow "/sbin/nologin")))))
(define cloudflare-tunnel-shepherd-service (define cloudflare-tunnel-shepherd-service
(match-lambda (match-lambda
(($ <cloudflare-tunnel-configuration> cloudflared metrics (($ <cloudflare-tunnel-configuration> cloudflared metrics
@ -162,7 +152,7 @@ headers. This can expose sensitive information in your logs.")
(list (shepherd-service (list (shepherd-service
(documentation "Run cloudflared.") (documentation "Run cloudflared.")
(provision '(cloudflare-tunnel)) (provision '(cloudflare-tunnel))
(requirement '(networking)) (requirement '(loopback networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$cloudflared (list #$cloudflared
"tunnel" "tunnel"
@ -180,8 +170,8 @@ headers. This can expose sensitive information in your logs.")
'("--post-quantum") '("--post-quantum")
'()) '())
#$@extra-options) #$@extra-options)
#:user "cloudflared" #:user "nobody"
#:group "cloudflared" #:group "nogroup"
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
@ -190,9 +180,7 @@ headers. This can expose sensitive information in your logs.")
(name 'cloudflare-tunnel) (name 'cloudflare-tunnel)
(extensions (extensions
(list (service-extension shepherd-root-service-type (list (service-extension shepherd-root-service-type
cloudflare-tunnel-shepherd-service) cloudflare-tunnel-shepherd-service)))
(service-extension account-service-type
(const %cloudflare-tunnel-accounts))))
(default-value (cloudflare-tunnel-configuration)) (default-value (cloudflare-tunnel-configuration))
(description "Run cloudflared, the Cloudflare Tunnel daemon."))) (description "Run cloudflared, the Cloudflare Tunnel daemon.")))
@ -213,10 +201,9 @@ headers. This can expose sensitive information in your logs.")
"Association list of miniflux configurations.")) "Association list of miniflux configurations."))
(define %miniflux-accounts (define %miniflux-accounts
(list (user-group (name "miniflux") (system? #t)) (list (user-account
(user-account
(name "miniflux") (name "miniflux")
(group "miniflux") (group "nogroup")
(system? #t) (system? #t)
(home-directory "/var/empty") (home-directory "/var/empty")
(shell (file-append shadow "/sbin/nologin"))))) (shell (file-append shadow "/sbin/nologin")))))
@ -243,7 +230,7 @@ headers. This can expose sensitive information in your logs.")
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list #$miniflux "-config-file" #$config-file) (list #$miniflux "-config-file" #$config-file)
#:user "miniflux" #:user "miniflux"
#:group "miniflux" #:group "nogroup"
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor)))))))) (stop #~(make-kill-destructor))))))))