From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 20:15:19 2024 Received: (at submit) by debbugs.gnu.org; 26 Feb 2024 01:15:19 +0000 Received: from localhost ([127.0.0.1]:40191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rePaQ-0007AG-SJ for submit@debbugs.gnu.org; Sun, 25 Feb 2024 20:15:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:40996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rePaN-00079z-W7 for submit@debbugs.gnu.org; Sun, 25 Feb 2024 20:15:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reOzD-0000rc-Mv for guix-patches@gnu.org; Sun, 25 Feb 2024 19:36:51 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reOzB-0003sY-SY for guix-patches@gnu.org; Sun, 25 Feb 2024 19:36:51 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 06DEA5C005D; Sun, 25 Feb 2024 19:36:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 25 Feb 2024 19:36:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1708907808; x=1708994208; bh=WI VpXlcck2RcLvHZQuYsrD7WQPEREUHj74U2tSOUbfU=; b=Jp+r7XIoHCMARJQPvY 8+xD2w0StqhipMaG8SQ6qkIwP3PA+OyYOm2E/nG/uOk7Fk9K4i6NB2UDp3LELauh WGUb8eCOhbJl8LQq7IeaDiMIsx4qtjQumLr9T+L9OvxqVs6mzYe4GpWEdMYcFxeb Z9BB8Bq7WkKQfCOq3Y7YAbi4RvHs9TEFt2I/LrCSMDjEvxBbNkZQFDsU9mhcxDiU O+OkajLsVxyT3RpnOxSwsNADGdk9Jkfat6sV4SS65NevjPYjxuU7imZhC69LaZ2r 2Glyx8IgLS64bz3XON9XdktpwFcNuWMksc7C8qS6WAGcg+WawscnMw+bpYMYhofB lgcg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1708907808; x=1708994208; bh=WIVpXlcck2RcL vHZQuYsrD7WQPEREUHj74U2tSOUbfU=; b=phUHRBTbWTAqM8lGBnzwn39zsYbxz uDostQW9tQ/atoP35rYHWCeCTijhe3iI+DXkuSITSsue2Gx03FYjKx1lTw5awhSI 0rcN/7+/CFRNfO4W+yMl7ThvfXFgYOdnhOGVuYJ6V1mvnZ74rtUXCxYGwYoGbZPa K+h4Z6SidkgSi1tazO4NmDetdr4ROooZFgz2kbTU8IdYRrk6jhH83X7+G1J8zBc5 rprH+Vzw6lf9pCvICwadwV3MIp4YYy1jrI2vmkI4Q+xefsUcXWtJHlZE0Fksh9iJ VguCAXQHkYlcLZo35yW84zQqyqictp3SCFOKZ4lEoJlc7XVc/3sORPbVg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgedugddvgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfpihhkkhhilhomuceohhgvlhhloheslhhnihhkkhhi rdhlrgeqnecuggftrfgrthhtvghrnheptdffudehleevjedtvefghfeihefhuedugeeihe ejgeehgfdvffegjeefvdetvdegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhephhgvlhhloheslhhnihhkkhhirdhlrg X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 Feb 2024 19:36:47 -0500 (EST) From: =?utf-8?Q?Leo=20Nikkil=C3=A4?= To: guix-patches@gnu.org Subject: [PATCH] services: nginx: Make log formats configurable. Date: Mon, 26 Feb 2024 02:29:18 +0200 Message-ID: <20240226003615.21481-1-hello@lnikki.la> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.28; envelope-from=hello@lnikki.la; helo=out4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Leo=20Nikkil=C3=A4?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Currently it's not possible to configure the log format through Guix, since additional log formats must be declared before they're used, and `extra-content' is always added at the bottom of the `http' block. This patch aims to make these log formats configurable. * gnu/services/web.scm (): New record. ()[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. --- doc/guix.texi | 40 +++++++++++++++++++++++++++++++++++++--- gnu/services/web.scm | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 671cdab6f8..71a00740bc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31684,6 +31693,31 @@ valued G-expression. @end table @end deftp +@deftp {Data Type} nginx-log-format-configuration +Data type representing the configuration of a custom Nginx log format. +This type has the following parameters: + +@table @asis +@item @code{name} (type: symbol) +The name of the log format as a symbol. + +@item @code{escape} (default: @code{'default}) (type: symbol) +The mode used to escape values of variables in the format. The +supported values are: + +@itemize +@item @code{'default}, to escape all characters outside of the ASCII + printable range. +@item @code{'json}, to escape all characters invalid in JSON strings. +@item @code{'none}, to disable escaping. +@end itemize + +@item @code{format} (type: string) +The format as accepted by the @code{log_format} directive. + +@end table +@end deftp + @anchor{nginx-server-configuration} @deftp {Data Type} nginx-server-configuration Data type representing the configuration of an nginx server block. diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..5f895bab6d 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2022 Simen Endsjø ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Miguel Ángel Moreno +;;; Copyright © 2024 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,8 @@ (define-module (gnu services web) 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 @@ (define-module (gnu services web) 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 @@ -522,6 +531,23 @@ (define httpd-service-type (httpd-configuration)) (description "Run the Apache httpd Web server."))) +(define-record-type* + 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 make-nginx-server-configuration nginx-server-configuration? @@ -580,6 +606,10 @@ (define-record-type* (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 + (default '())) (run-directory nginx-configuration-run-directory ;string (default "/var/run/nginx")) (server-blocks nginx-configuration-server-blocks @@ -635,6 +665,12 @@ (define emit-global-directive ((key . value) (format #f "~a ~a;~%" key value)))) +(define emit-nginx-log-format-config + (match-lambda + (($ name escape format) + (list " log_format " (symbol->string name) " escape=" + (symbol->string escape) " " format ";\n")))) + (define emit-nginx-location-config (match-lambda (($ uri body) @@ -718,7 +754,7 @@ (define (default-nginx-config config) (match-record config (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 @@ -740,7 +776,8 @@ (define (default-nginx-config config) " 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;~%" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 20:19:16 2024 Received: (at 69399) by debbugs.gnu.org; 26 Feb 2024 01:19:16 +0000 Received: from localhost ([127.0.0.1]:40590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rePeF-0007O7-Qx for submit@debbugs.gnu.org; Sun, 25 Feb 2024 20:19:16 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rePeD-0007Np-NI for 69399@debbugs.gnu.org; Sun, 25 Feb 2024 20:19:14 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 3F9C95C0078; Sun, 25 Feb 2024 20:18:43 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 25 Feb 2024 20:18:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1708910323; x=1708996723; bh=6x W31kzWf/0YeS4B0SxDKDdvKpY+9LYyZASlLiz5lrk=; b=GZ+TBq4jQE6/saDXee 4LTP3prHfiEWoqTjiGVN60o32y9Kvb5LG8kztvpVkPoIitkOV1fzuLr87vCcYtUp 70HfeXZ4h2XnQm0WFa71u8aVgxxJfsGxxui0UFr3AQrfY5lrkx4dNkwVWrYNHY7+ YDlEmeGgqMH+DsSB6B3VtBA104IvR9QjXVxUXuUIAH3IbxHheJKpW5tUiTfbgTe9 VsLukF1TCJJKn+0zlj55J0p+RzwsnWNyYdIyKM8dcuhnnNp4saW41ylsg8zqiwAS +2FHjAxGUgTbQneV4wf+lY8i4yFAV5RXipFedVy6upweL89X3pWn0elyNwy6dCpZ tMvw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1708910323; x=1708996723; bh=6xW31kzWf/0Ye S4B0SxDKDdvKpY+9LYyZASlLiz5lrk=; b=Yaxeee+p5iJUYq5sa9pxGpST6btf6 LxyvmBDuCchfH3ruDgGuCxtYLAnwcwfLwk7lQh/zZ8MQ7mmdV3M+hy87GrUG4vxA 7TunMAoOejp+GpEGA82bOJotklZCV46ttMlXYh/bJ26cygc1vG5VLTQM832SIzzn mJ5HiUOUysFRl3Q2ArvZiLfdNB4+HGDt8QHF7PZuQzFEvJAqFnb0lGMwGPM9VYXI gBgUPVtclF3IrCblLmVI+mZuoOdo0N1bJe5y1aZeYqZXyRGaUACK0nStyfDMd6MI lrJuM34ke9NuUWabd+qqlLSXOlSFTJX/LVwO/t0HkCnQ5Bevsu2VyAOdA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgedugdeffecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfpihhkkhhilhomuceohhgvlhhloheslhhnihhkkhhi rdhlrgeqnecuggftrfgrthhtvghrnheptdffudehleevjedtvefghfeihefhuedugeeihe ejgeehgfdvffegjeefvdetvdegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhephhgvlhhloheslhhnihhkkhhirdhlrg X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 Feb 2024 20:18:42 -0500 (EST) From: =?utf-8?Q?Leo=20Nikkil=C3=A4?= To: 69399@debbugs.gnu.org Subject: [PATCH v2] services: nginx: Make log formats configurable. Date: Mon, 26 Feb 2024 03:16:29 +0200 Message-ID: <20240226011822.23092-1-hello@lnikki.la> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69399 Cc: =?UTF-8?q?Leo=20Nikkil=C3=A4?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Oops, accidentally erased one of the hunks in the patch. Here's v2. * gnu/services/web.scm (): New record. ()[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. --- doc/guix.texi | 40 +++++++++++++++++++++++++++++++++++++--- gnu/services/web.scm | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 671cdab6f8..71a00740bc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31557,10 +31557,19 @@ started. @item @code{log-directory} (default: @code{"/var/log/nginx"}) The directory to which NGinx will write log files. +@item @code{log-format} (default: @code{'combined}) (type: symbol) +Logging format for the access log. Nginx defaults to the httpd-like +format named @code{'combined}. Other formats can be defined using +@code{log-formats}. + +@item @code{log-formats} (default: @code{'()}) +A list of additional @dfn{log formats} to define, the elements should be +of type @code{}. + @item @code{log-level} (default: @code{'error}) (type: symbol) -Logging level, which can be any of the following values: @code{'debug}, -@code{'info}, @code{'notice}, @code{'warn}, @code{'error}, @code{'crit}, -@code{'alert}, or @code{'emerg}. +Logging level for the error log, which can be any of the following +values: @code{'debug}, @code{'info}, @code{'notice}, @code{'warn}, +@code{'error}, @code{'crit}, @code{'alert}, or @code{'emerg}. @item @code{run-directory} (default: @code{"/var/run/nginx"}) The directory in which NGinx will create a pid file, and write temporary @@ -31684,6 +31693,31 @@ valued G-expression. @end table @end deftp +@deftp {Data Type} nginx-log-format-configuration +Data type representing the configuration of a custom Nginx log format. +This type has the following parameters: + +@table @asis +@item @code{name} (type: symbol) +The name of the log format as a symbol. + +@item @code{escape} (default: @code{'default}) (type: symbol) +The mode used to escape values of variables in the format. The +supported values are: + +@itemize +@item @code{'default}, to escape all characters outside of the ASCII + printable range. +@item @code{'json}, to escape all characters invalid in JSON strings. +@item @code{'none}, to disable escaping. +@end itemize + +@item @code{format} (type: string) +The format as accepted by the @code{log_format} directive. + +@end table +@end deftp + @anchor{nginx-server-configuration} @deftp {Data Type} nginx-server-configuration Data type representing the configuration of an nginx server block. diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..5f895bab6d 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2022 Simen Endsjø ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Miguel Ángel Moreno +;;; Copyright © 2024 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,8 @@ (define-module (gnu services web) 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 @@ (define-module (gnu services web) 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 @@ -522,6 +531,23 @@ (define httpd-service-type (httpd-configuration)) (description "Run the Apache httpd Web server."))) +(define-record-type* + 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 make-nginx-server-configuration nginx-server-configuration? @@ -580,6 +606,10 @@ (define-record-type* (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 + (default '())) (run-directory nginx-configuration-run-directory ;string (default "/var/run/nginx")) (server-blocks nginx-configuration-server-blocks @@ -635,6 +665,12 @@ (define emit-global-directive ((key . value) (format #f "~a ~a;~%" key value)))) +(define emit-nginx-log-format-config + (match-lambda + (($ name escape format) + (list " log_format " (symbol->string name) " escape=" + (symbol->string escape) " " format ";\n")))) + (define emit-nginx-location-config (match-lambda (($ uri body) @@ -718,7 +754,7 @@ (define (default-nginx-config config) (match-record config (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 @@ -740,7 +776,8 @@ (define (default-nginx-config config) " 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;~%" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 11 17:18:41 2025 Received: (at 69399-done) by debbugs.gnu.org; 11 Jan 2025 22:18:41 +0000 Received: from localhost ([127.0.0.1]:45234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWjoX-0008Bw-6n for submit@debbugs.gnu.org; Sat, 11 Jan 2025 17:18:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59682) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWjoU-0008Bi-Vo for 69399-done@debbugs.gnu.org; Sat, 11 Jan 2025 17:18:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tWjoP-0005qO-64; Sat, 11 Jan 2025 17:18:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=aqk1sp4d2a2IS4WGCX26Wt+AtmipT7IkR1nUDw/OmwQ=; b=cQ+4kd6ohe+RwUDFF3zF JiKoY+rr1ldY2MBWM1pNM5mctrgFD0o9y75XODOVEluLDWUR9u/zaljLmyg5VAk5ys3qDCaZ0x9Ie cVpU7L9DmY37P3T1w07eyMkP1q35e1Y7n20OtGSfvfWM7dT1sJjvGYl9/4/GKng3Sw033fL/thxmx ev15VsSS28T1X9M3QLKnl4YHeHBJrApDU58xawh5r8fdkNZiSSil5WtrhT9d7tmal1nSCSwGAGddB Ak9MDnlTNvaqL4QPk9Lh4ELHOK9cVpyC3Dt69XHUorRMaMQfgoyuBKZXjJxQIu41pwzpt5/8Fs8w1 ibEWugE9fY9SfA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Leo =?utf-8?Q?Nikkil=C3=A4?= Subject: Re: [bug#69399] [PATCH v2] services: nginx: Make log formats configurable. In-Reply-To: <20240226011822.23092-1-hello@lnikki.la> ("Leo =?utf-8?Q?Nikk?= =?utf-8?Q?il=C3=A4=22's?= message of "Mon, 26 Feb 2024 03:16:29 +0200") References: <20240226003615.21481-1-hello@lnikki.la> <20240226011822.23092-1-hello@lnikki.la> Date: Sat, 11 Jan 2025 23:18:30 +0100 Message-ID: <87r059m1u1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69399-done Cc: 69399-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Leo Nikkil=C3=A4 skribis: > Oops, accidentally erased one of the hunks in the patch. Here's v2. > > * gnu/services/web.scm (): New record. > ()[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. Finally applied. Thank you, and apologies for the terrible delay! Ludo=E2=80=99. From unknown Tue Jun 17 01:47:30 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 09 Feb 2025 12:24:18 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator