guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/09: services: web: Pass run-directory to nginx's actions.


From: guix-commits
Subject: 07/09: services: web: Pass run-directory to nginx's actions.
Date: Wed, 10 Jul 2024 10:13:30 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 01183a77aa9fabe4f949bad60d4f27f067737e1b
Author: Tomas Volf <~@wolfsden.cz>
AuthorDate: Fri Jul 5 17:01:20 2024 +0200

    services: web: Pass run-directory to nginx's actions.
    
    Reloading nginx lead to (harmless, yet annoying) alert being logged:
    
        nginx: [alert] could not open error log file: open() 
"/gnu/store/9l2lznlqpjcm79znq1xas378maqgysc8-nginx-1.27.0/logs/error.log" 
failed (2: No such file or directory)
    
    Since there already is prepared runtime directory for nginx, all that was
    missing was to also pass it to the reload and reopen invocations.
    
    * gnu/services/web.scm (nginx-shepherd-service)[reload, reopen]: Pass -p 
flag
    with run-directory as value.
    
    Change-Id: Id5c558d65def8c1fe5cf581a4a370508ac05e550
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/services/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index ee3499e5cd..c434436f69 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -857,11 +857,11 @@ This has the effect of killing old worker processes and 
starting new ones, using
 the same configuration file.  It is useful for situations where the same nginx
 configuration file can point to different things after a reload, such as
 renewed TLS certificates, or @code{include}d files.")
-                 (procedure (nginx-action "-s" "reload")))
+                 (procedure (nginx-action "-p" run-directory "-s" "reload")))
                (shepherd-action
                 (name 'reopen)
                 (documentation "Re-open log files.")
-                (procedure (nginx-action "-s" "reopen"))))))))))
+                (procedure (nginx-action "-p" run-directory "-s" 
"reopen"))))))))))
 
 (define nginx-service-type
   (service-type (name 'nginx)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]