From patchwork Fri Jul 5 15:01:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 65939 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 08BBA27BBE9; Fri, 5 Jul 2024 16:02:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E13627BBE2 for ; Fri, 5 Jul 2024 16:02:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPkRn-0001IB-76; Fri, 05 Jul 2024 11:02:03 -0400 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 1sPkRk-0001Gu-QD for guix-patches@gnu.org; Fri, 05 Jul 2024 11:02:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPkRk-0000Jb-HV for guix-patches@gnu.org; Fri, 05 Jul 2024 11:02:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPkRm-0001aS-Hs for guix-patches@gnu.org; Fri, 05 Jul 2024 11:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71949] [PATCH] services: web: Pass run-directory to nginx's actions. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2024 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71949@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17201916986053 (code B ref -1); Fri, 05 Jul 2024 15:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jul 2024 15:01:38 +0000 Received: from localhost ([127.0.0.1]:44768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPkRO-0001ZY-0p for submit@debbugs.gnu.org; Fri, 05 Jul 2024 11:01:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:35556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sPkRM-0001ZQ-LS for submit@debbugs.gnu.org; Fri, 05 Jul 2024 11:01:36 -0400 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 <~@wolfsden.cz>) id 1sPkRJ-0001DO-7y for guix-patches@gnu.org; Fri, 05 Jul 2024 11:01:33 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1sPkRH-0008BC-7R for guix-patches@gnu.org; Fri, 05 Jul 2024 11:01:33 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id DD5DE2B0E56; Fri, 5 Jul 2024 15:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1720191686; bh=3aM8lcopBx7XfRaDftO9XM/wd3n4lf0mZ7/bVNLcZPM=; h=From:To:Cc:Subject:Date; b=Y7PA1Vr1RErZVWFgNHgJy2u3/gmA15uG7ZmKm3aoS/HY2mLTVwo4qvEHok47bCKVg ByJdDKAQoA90epLv/10EwDWARDh8inkODqfXdkDX/kqfOrVMLbjLFMHgE1LtGnVybK HO8fcC1aNJjHUTTkLp4kX78dGaDzt9GAXap8AHF7fOCoXiKkfI55v6tfW75dDIi1am LrZaKe7NAAhhSTFcxZWrIlUYfIK5upR6i3O0PaOS2uNkY7HxvczLo0Y/dJcWxhPtF6 50GWmglIm6pO7wyXcCr16Vdcl1vY2ozmWIkaE2CH32Z02HWKwVsV4vP6vn74FefcgX WA7/oo7gcLKUFJbitFGsBGB7I68X1Y1QM6Hlty1AbMcR0eBLhJ73Z9ZRdu7Rdizwbr AKbStT74rZJIhw2IaUNgquqOjtWw2gRiMj87pxX8esiVGxjC1L6qyplOKvK+/RFnRa LLcEsBjR98StdHahi4MbP2/m6F9wj8xyN+1PdQKm5IMymy5sPErcGuCPnvur8fqdPP SYm7wM1hna4UFbwBVhhqlBRGOl0VJ1zG2hSRy1KYtSmQ+AsqNbIpJ3XiIuYJpxYJr7 v7xFais/if+LQTGKJOD7xuH7ecNP/hDNRQBxYvLKuYrDidbzHVJ56fomgkIKq7b8Yq Xt6JDiX/QfEDjAjFupHapY2g= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 094872B09CC; Fri, 5 Jul 2024 15:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1720191686; bh=3aM8lcopBx7XfRaDftO9XM/wd3n4lf0mZ7/bVNLcZPM=; h=From:To:Cc:Subject:Date; b=Y7PA1Vr1RErZVWFgNHgJy2u3/gmA15uG7ZmKm3aoS/HY2mLTVwo4qvEHok47bCKVg ByJdDKAQoA90epLv/10EwDWARDh8inkODqfXdkDX/kqfOrVMLbjLFMHgE1LtGnVybK HO8fcC1aNJjHUTTkLp4kX78dGaDzt9GAXap8AHF7fOCoXiKkfI55v6tfW75dDIi1am LrZaKe7NAAhhSTFcxZWrIlUYfIK5upR6i3O0PaOS2uNkY7HxvczLo0Y/dJcWxhPtF6 50GWmglIm6pO7wyXcCr16Vdcl1vY2ozmWIkaE2CH32Z02HWKwVsV4vP6vn74FefcgX WA7/oo7gcLKUFJbitFGsBGB7I68X1Y1QM6Hlty1AbMcR0eBLhJ73Z9ZRdu7Rdizwbr AKbStT74rZJIhw2IaUNgquqOjtWw2gRiMj87pxX8esiVGxjC1L6qyplOKvK+/RFnRa LLcEsBjR98StdHahi4MbP2/m6F9wj8xyN+1PdQKm5IMymy5sPErcGuCPnvur8fqdPP SYm7wM1hna4UFbwBVhhqlBRGOl0VJ1zG2hSRy1KYtSmQ+AsqNbIpJ3XiIuYJpxYJr7 v7xFais/if+LQTGKJOD7xuH7ecNP/hDNRQBxYvLKuYrDidbzHVJ56fomgkIKq7b8Yq Xt6JDiX/QfEDjAjFupHapY2g= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 5 Jul 2024 17:01:20 +0200 Message-ID: <063981d97d79af7abec66592d40c6beff9adea46.1720191680.git.~@wolfsden.cz> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 --- 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 c10bd4cdff..b73cd30fe7 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -858,11 +858,11 @@ (define (nginx-shepherd-service config) 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)