summaryrefslogtreecommitdiff
path: root/gnu/services/admin.scm
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2017-07-26 12:18:06 +0100
committerChristopher Baines <mail@cbaines.net>2017-08-09 23:50:31 +0100
commit91fdc8a574cccecd55d042bc1f76ab7f7d3adced (patch)
tree33f3bfb525124978683088b316042ddf73d762f7 /gnu/services/admin.scm
parentf2d8e7f720c92dfb0f49d61f7b66d45e3e63e4cd (diff)
services: Update the Tailon service for Tailon 1.3.0.
Tailon 1.3.0 (upgraded from 1.1.1) adds support for HTTP authentication. * gnu/services/admin.scm (<tailon-configuration-file>): Add http-auth and users configuration values. (tailon-configuration-file-http-auth, tailon-configuration-file-users): New procedures. (tailon-configuration-file-compiler): Add support for the http-auth and users configuration options. * doc/guix.texi (Monitoring Services): Document authentication for Tailon.
Diffstat (limited to 'gnu/services/admin.scm')
-rw-r--r--gnu/services/admin.scm24
1 files changed, 19 insertions, 5 deletions
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 19169427c0c..e24aebae2ca 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -59,8 +59,8 @@
59 tailon-configuration-file-tail-lines 59 tailon-configuration-file-tail-lines
60 tailon-configuration-file-allowed-commands 60 tailon-configuration-file-allowed-commands
61 tailon-configuration-file-debug? 61 tailon-configuration-file-debug?
62 tailon-configuration-file-wrap-lines 62 tailon-configuration-file-http-auth
63 63 tailon-configuration-file-users
64 64
65 <tailon-configuration> 65 <tailon-configuration>
66 tailon-configuration 66 tailon-configuration
@@ -224,7 +224,11 @@ for ROTATION."
224 (debug? tailon-configuration-file-debug? 224 (debug? tailon-configuration-file-debug?
225 (default #f)) 225 (default #f))
226 (wrap-lines tailon-configuration-file-wrap-lines 226 (wrap-lines tailon-configuration-file-wrap-lines
227 (default #t))) 227 (default #t))
228 (http-auth tailon-configuration-file-http-auth
229 (default #f))
230 (users tailon-configuration-file-users
231 (default #f)))
228 232
229(define (tailon-configuration-files-string files) 233(define (tailon-configuration-files-string files)
230 (string-append 234 (string-append
@@ -254,7 +258,7 @@ for ROTATION."
254 (($ <tailon-configuration-file> files bind relative-root 258 (($ <tailon-configuration-file> files bind relative-root
255 allow-transfers? follow-names? 259 allow-transfers? follow-names?
256 tail-lines allowed-commands debug? 260 tail-lines allowed-commands debug?
257 wrap-lines) 261 wrap-lines http-auth users)
258 (text-file 262 (text-file
259 "tailon-config.yaml" 263 "tailon-config.yaml"
260 (string-concatenate 264 (string-concatenate
@@ -273,7 +277,17 @@ for ROTATION."
273 (string-join allowed-commands ", ") 277 (string-join allowed-commands ", ")
274 "]")) 278 "]"))
275 ,@(if debug? '(("debug" . "true")) '()) 279 ,@(if debug? '(("debug" . "true")) '())
276 ("wrap-lines" . ,(if wrap-lines "true" "false"))))))))) 280 ("wrap-lines" . ,(if wrap-lines "true" "false"))
281 ("http-auth" . ,http-auth)
282 ("users" . ,(if users
283 (string-concatenate
284 (cons "\n"
285 (map (match-lambda
286 ((user . pass)
287 (string-append
288 " " user ":" pass)))
289 users)))
290 #f)))))))))
277 291
278(define-record-type* <tailon-configuration> 292(define-record-type* <tailon-configuration>
279 tailon-configuration make-tailon-configuration 293 tailon-configuration make-tailon-configuration