diff --git a/glicid/services/caddy.scm b/glicid/services/caddy.scm index 39e788d..3f52dab 100644 --- a/glicid/services/caddy.scm +++ b/glicid/services/caddy.scm @@ -33,11 +33,13 @@ (caddy caddy (default caddy-dirty)) (config-file config-file (default "")) (log-file log-file (default "/var/log/caddy.log")) + (proxy proxy (default #f)) + (noproxy noproxy (default #f)) ) (define caddy-service (match-lambda - (($ caddy config-file log-file) + (($ caddy config-file log-file proxy noproxy) (list (shepherd-service (provision '(caddy)) (documentation "Run caddy.") (requirement '(user-processes)) @@ -52,7 +54,16 @@ #:log-file #$log-file #:environment-variables (list "PATH=/run/current-system/profile/bin:/run/current-system/profile/sbin:/run/current-system/profile/libexec:/run/privileged/bin" - "HOME=/var/lib/caddy") + "HOME=/var/lib/caddy" + #$@(if proxy + (list + string-append "http_proxy=" #$proxy + string-append "https_proxy=" #$proxy) + '()) + #$@(if noproxy + (string-append "no_proxy=" #$noproxy) + '()) + ) #:user "caddy" #:group "caddy" ))