amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: nginx: Make log formats configurable.

Browse source 
* gnu/services/web.scm (<nginx-log-format-configuration>): New record.
(<nginx-configuration>)[log-format, log-formats]: New fields.
(assert-valid-log-format-escape): New procedure.
(emit-nginx-log-format-config): New procedure.
(default-nginx-config): Make log formats configurable.
* doc/guix.texi (Web Services): Document it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I8a16a1a9a20f64606dac0a1e14f1c5217d351f90
This commit is contained in:
Leo Nikkilä 2024-02-26 03:16:29 +02:00 • committed by Ludovic Courtès
parent 8db6cfe022
commit 5ee26f0bf4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 76 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gnu/services/web.scm
View file

@ -17,6 +17,7 @@
;;; Copyright © 2022 Simen Endsjø <simendsjo@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Miguel Ángel Moreno <mail@migalmoreno.com>
;;; Copyright © 2024 Leo Nikkilä <hello@lnikki.la>
;;;
;;; This file is part of GNU Guix.
;;;
@ -103,6 +104,8 @@
nginx-configuration-nginx
nginx-configuration-shepherd-requirement
nginx-configuration-log-directory
nginx-configuration-log-format
nginx-configuration-log-formats
nginx-configuration-log-level
nginx-configuration-run-directory
nginx-configuration-server-blocks
@ -114,6 +117,12 @@
nginx-configuration-extra-content
nginx-configuration-file
nginx-log-format-configuration
nginx-log-format-configuration?
nginx-log-format-configuration-name
nginx-log-format-configuration-escape
nginx-log-format-configuration-format
nginx-server-configuration
nginx-server-configuration?
nginx-server-configuration-listen
@ -525,6 +534,23 @@
(httpd-configuration))
(description "Run the Apache httpd Web server.")))
(define-record-type* <nginx-log-format-configuration>
nginx-log-format-configuration make-nginx-log-format-configuration
nginx-log-format-configuration?
(name nginx-log-format-configuration-name)
(escape nginx-log-format-configuration-escape
(sanitize assert-valid-log-format-escape)
(default 'default))
(format nginx-log-format-configuration-format))
(define (assert-valid-log-format-escape escape)
"Ensure @var{escape} is one of @code{'default}, @code{'json}, or
@code{'none}."
(unless (memq escape '(default json none))
(raise
(formatted-message (G_ "unknown log format escape '~a'~%") escape)))
escape)
(define-record-type* <nginx-server-configuration>
nginx-server-configuration make-nginx-server-configuration
nginx-server-configuration?
@ -583,6 +609,10 @@
(log-level nginx-configuration-log-level
(sanitize assert-valid-log-level)
(default 'error))
(log-format nginx-configuration-log-format ;symbol
(default 'combined))
(log-formats nginx-configuration-log-formats ;list of <nginx-log-format-configuration>
(default '()))
(run-directory nginx-configuration-run-directory ;string
(default "/var/run/nginx"))
(server-blocks nginx-configuration-server-blocks
@ -638,6 +668,12 @@ of index files."
((key . value)
(format #f "~a ~a;~%" key value))))
(define emit-nginx-log-format-config
(match-lambda
(($ <nginx-log-format-configuration> name escape format)
(list " log_format " (symbol->string name) " escape="
(symbol->string escape) " " format ";\n"))))
(define emit-nginx-location-config
(match-lambda
(($ <nginx-location-configuration> uri body)
@ -723,7 +759,7 @@ of index files."
(match-record config
<nginx-configuration>
(nginx log-directory run-directory
log-level
log-level log-format log-formats
server-blocks upstream-blocks
server-names-hash-bucket-size
server-names-hash-bucket-max-size
@ -745,7 +781,8 @@ of index files."
" fastcgi_temp_path " run-directory "/fastcgi_temp;\n"
" uwsgi_temp_path " run-directory "/uwsgi_temp;\n"
" scgi_temp_path " run-directory "/scgi_temp;\n"
" access_log " log-directory "/access.log;\n"
(map emit-nginx-log-format-config log-formats)
" access_log " log-directory "/access.log " (symbol->string log-format) ";\n"
" include " nginx "/share/nginx/conf/mime.types;\n"
(if lua-package-path
#~(format #f " lua_package_path ~s;~%"