mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
services: admin: Export rottlog-configuration accessors.
* gnu/services/admin.scm (<rottlog-configuration>): Rename accessors rottlog-rottlog to rottlog-configuration-rottlog, rottlog-rc-file to rottlog-configuration-rc-file, rottlog-rotations to rottlog-configuration-rotations, rottlog-jobs to rottlog-configuration-jobs. (rottlog-etc, rottlog-jobs-or-default, rottlog-service-type): Adjust accordingly.
This commit is contained in:
parent
f3714b3d5f
commit
7e4324575c
1 changed files with 14 additions and 10 deletions
|
@ -52,6 +52,10 @@ (define-module (gnu services admin)
|
||||||
|
|
||||||
rottlog-configuration
|
rottlog-configuration
|
||||||
rottlog-configuration?
|
rottlog-configuration?
|
||||||
|
rottlog-configuration-rottlog
|
||||||
|
rottlog-configuration-rc-file
|
||||||
|
rottlog-configuration-rotations
|
||||||
|
rottlog-configuration-jobs
|
||||||
rottlog-service
|
rottlog-service
|
||||||
rottlog-service-type
|
rottlog-service-type
|
||||||
|
|
||||||
|
@ -193,25 +197,25 @@ (define (default-jobs rottlog)
|
||||||
(define-record-type* <rottlog-configuration>
|
(define-record-type* <rottlog-configuration>
|
||||||
rottlog-configuration make-rottlog-configuration
|
rottlog-configuration make-rottlog-configuration
|
||||||
rottlog-configuration?
|
rottlog-configuration?
|
||||||
(rottlog rottlog-rottlog ;file-like
|
(rottlog rottlog-configuration-rottlog ;file-like
|
||||||
(default rottlog))
|
(default rottlog))
|
||||||
(rc-file rottlog-rc-file ;file-like
|
(rc-file rottlog-configuration-rc-file ;file-like
|
||||||
(default (file-append rottlog "/etc/rc")))
|
(default (file-append rottlog "/etc/rc")))
|
||||||
(rotations rottlog-rotations ;list of <log-rotation>
|
(rotations rottlog-configuration-rotations ;list of <log-rotation>
|
||||||
(default %default-rotations))
|
(default %default-rotations))
|
||||||
(jobs rottlog-jobs ;list of <mcron-job>
|
(jobs rottlog-configuration-jobs ;list of <mcron-job>
|
||||||
(default #f)))
|
(default #f)))
|
||||||
|
|
||||||
(define (rottlog-etc config)
|
(define (rottlog-etc config)
|
||||||
`(("rottlog"
|
`(("rottlog"
|
||||||
,(file-union "rottlog"
|
,(file-union "rottlog"
|
||||||
(cons `("rc" ,(rottlog-rc-file config))
|
(cons `("rc" ,(rottlog-configuration-rc-file config))
|
||||||
(log-rotations->/etc-entries
|
(log-rotations->/etc-entries
|
||||||
(rottlog-rotations config)))))))
|
(rottlog-configuration-rotations config)))))))
|
||||||
|
|
||||||
(define (rottlog-jobs-or-default config)
|
(define (rottlog-jobs-or-default config)
|
||||||
(or (rottlog-jobs config)
|
(or (rottlog-configuration-jobs config)
|
||||||
(default-jobs (rottlog-rottlog config))))
|
(default-jobs (rottlog-configuration-rottlog config))))
|
||||||
|
|
||||||
(define rottlog-service-type
|
(define rottlog-service-type
|
||||||
(service-type
|
(service-type
|
||||||
|
@ -226,12 +230,12 @@ (define rottlog-service-type
|
||||||
;; Add Rottlog to the global profile so users can access
|
;; Add Rottlog to the global profile so users can access
|
||||||
;; the documentation.
|
;; the documentation.
|
||||||
(service-extension profile-service-type
|
(service-extension profile-service-type
|
||||||
(compose list rottlog-rottlog))))
|
(compose list rottlog-configuration-rottlog))))
|
||||||
(compose concatenate)
|
(compose concatenate)
|
||||||
(extend (lambda (config rotations)
|
(extend (lambda (config rotations)
|
||||||
(rottlog-configuration
|
(rottlog-configuration
|
||||||
(inherit config)
|
(inherit config)
|
||||||
(rotations (append (rottlog-rotations config)
|
(rotations (append (rottlog-configuration-rotations config)
|
||||||
rotations)))))
|
rotations)))))
|
||||||
(default-value (rottlog-configuration))))
|
(default-value (rottlog-configuration))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue