[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: services: rottlog: Improve default weekly rotations.
From: |
Ludovic Courtès |
Subject: |
01/05: services: rottlog: Improve default weekly rotations. |
Date: |
Mon, 3 Oct 2016 13:26:37 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 4d67ed70a396ff0d374b93ed2b9eeccdc28c04b6
Author: Ludovic Courtès <address@hidden>
Date: Mon Oct 3 14:39:25 2016 +0200
services: rottlog: Improve default weekly rotations.
* gnu/services/admin.scm (%rotated-files): Add "/var/log/maillog".
(syslog-rotation-config): Change parameter to 'files'. Return a
string-append gexp for all of FILES.
(simple-rotation-config): Remove unnecessary 'postrotate' and
'endscript'.
(%default-rotations): Adjust accordingly.
---
gnu/services/admin.scm | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 6e04039..aeeec4e 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
+;;; Copyright © 2016 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -44,10 +45,12 @@
;;; Code:
(define %rotated-files
- '("/var/log/messages" "/var/log/secure"))
+ ;; Syslog files subject to rotation.
+ '("/var/log/messages" "/var/log/secure" "/var/log/maillog"))
-(define (syslog-rotation-config file)
- #~(#$file " {
+(define (syslog-rotation-config files)
+ #~(string-append #$(string-join files ",")
+ " {
sharedscripts
postrotate
" #$coreutils "/bin/kill -HUP $(cat /var/run/syslog.pid) 2> /dev/null
@@ -58,8 +61,6 @@
(define (simple-rotation-config file)
(string-append file " {
sharedscripts
- postrotate
- endscript
}
"))
@@ -68,12 +69,8 @@
,(computed-file "rottlog.weekly"
#~(call-with-output-file #$output
(lambda (port)
- (display
- (string-join
- (apply append '#$(map syslog-rotation-config
- %rotated-files))
- "")
- port)
+ (display #$(syslog-rotation-config %rotated-files)
+ port)
(display #$(simple-rotation-config
"/var/log/shepherd.log")
port)))))))