diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-08-11 03:49:24 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-08-11 03:49:24 -0400 |
| commit | 3785e42e5219a86d9d8a5208ff18e97e0cbcbe78 (patch) | |
| tree | b4204645ec27c08735604b5043be44550f4d704e /gnu/services/admin.scm | |
| parent | d156c999d0e7413696064992bb4a001d2d95317d (diff) | |
| parent | d373c16f33fe0735a7a7d24899530c1af255b5f6 (diff) | |
| download | guix-3785e42e5219a86d9d8a5208ff18e97e0cbcbe78.tar guix-3785e42e5219a86d9d8a5208ff18e97e0cbcbe78.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/admin.scm')
| -rw-r--r-- | gnu/services/admin.scm | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 1044833fef..14452a86c7 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -59,6 +59,8 @@ tailon-configuration-file-tail-lines tailon-configuration-file-allowed-commands tailon-configuration-file-debug? + tailon-configuration-file-http-auth + tailon-configuration-file-users <tailon-configuration> tailon-configuration @@ -220,6 +222,12 @@ for ROTATION." (allowed-commands tailon-configuration-file-allowed-commands (default '("tail" "grep" "awk"))) (debug? tailon-configuration-file-debug? + (default #f)) + (wrap-lines tailon-configuration-file-wrap-lines + (default #t)) + (http-auth tailon-configuration-file-http-auth + (default #f)) + (users tailon-configuration-file-users (default #f))) (define (tailon-configuration-files-string files) @@ -249,7 +257,8 @@ for ROTATION." (match file (($ <tailon-configuration-file> files bind relative-root allow-transfers? follow-names? - tail-lines allowed-commands debug?) + tail-lines allowed-commands debug? + wrap-lines http-auth users) (text-file "tailon-config.yaml" (string-concatenate @@ -267,7 +276,18 @@ for ROTATION." ("commands" . ,(string-append "[" (string-join allowed-commands ", ") "]")) - ,@(if debug? '(("debug" . "true")) '())))))))) + ("debug" . ,(if debug? "true" #f)) + ("wrap-lines" . ,(if wrap-lines "true" "false")) + ("http-auth" . ,http-auth) + ("users" . ,(if users + (string-concatenate + (cons "\n" + (map (match-lambda + ((user . pass) + (string-append + " " user ":" pass))) + users))) + #f))))))))) (define-record-type* <tailon-configuration> tailon-configuration make-tailon-configuration |