From patchwork Mon Oct 17 20:57:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: EuAndreh X-Patchwork-Id: 43487 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 AF59327BBEA; Mon, 17 Oct 2022 21:59:20 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 7854427BBE9 for ; Mon, 17 Oct 2022 21:59:20 +0100 (BST) Received: from localhost ([::1]:55406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okXCh-0000uM-Lf for patchwork@mira.cbaines.net; Mon, 17 Oct 2022 16:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okXCR-0000tf-OK for guix-patches@gnu.org; Mon, 17 Oct 2022 16:59:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okXCQ-0000Xm-HO for guix-patches@gnu.org; Mon, 17 Oct 2022 16:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okXCQ-0000I4-Cn for guix-patches@gnu.org; Mon, 17 Oct 2022 16:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58590] [PATCH 1/2] services: nginx: Use nginx-action over inline gexp. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58590 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58590@debbugs.gnu.org Cc: EuAndreh X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16660402881054 (code B ref -1); Mon, 17 Oct 2022 20:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Oct 2022 20:58:08 +0000 Received: from localhost ([127.0.0.1]:50237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okXBY-0000Gw-9E for submit@debbugs.gnu.org; Mon, 17 Oct 2022 16:58:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:56976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okXBV-0000Gm-R5 for submit@debbugs.gnu.org; Mon, 17 Oct 2022 16:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okXBV-0008Q4-Iw for guix-patches@gnu.org; Mon, 17 Oct 2022 16:58:05 -0400 Received: from box.euandre.org ([46.101.160.115]:43225) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okXBT-0000SF-Ld for guix-patches@gnu.org; Mon, 17 Oct 2022 16:58:05 -0400 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 18F25FC4D1; Mon, 17 Oct 2022 17:57:30 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1666040252; bh=dBRDv4b9S9pHnPHWnei+med3CGoa99o9ZM0A/FAqZl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jj/dLta1zX+kb9zTjetUbjQ2wRhxow+pWgrfAATyBerp0/A4OmJpLR+prYxaaDoPo 1XtbYdEuZYa/0WV70EM36Ycf7bEZIXuD+6m8YMa1Y6U87RtPjgcfR9ueGKxHRW7roM o1DmeDvsgAGQKWj4R4O4tz8FELUwdTKNvDx68AFezdRNs8nw0waaxYeKuYodsJoHfI iVQ9MOgxEgd30UU6Hhb6lSTiP5Xk5GT4W/WYrUR3XyOmWYbW2rjz9yHvDlo1iuE4oh m6geqznFaVwgUpfzDgnLL7y8rXE6+F1c6UnXRy+KjP9CAQsQUhFfWVpxzwrGq0TGzF nneh49wQeXlJw== Date: Mon, 17 Oct 2022 17:57:18 -0300 Message-Id: <20221017205719.5704-2-eu@euandre.org> In-Reply-To: <20221017205719.5704-1-eu@euandre.org> References: <20221017205719.5704-1-eu@euandre.org> MIME-Version: 1.0 Received-SPF: pass client-ip=46.101.160.115; envelope-from=eu@euandre.org; helo=box.euandre.org 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" Reply-to: EuAndreh X-ACL-Warn: , EuAndreh via Guix-patches X-Patchwork-Original-From: EuAndreh via Guix-patches via From: EuAndreh X-getmail-retrieved-from-mailbox: Patches * gnu/services/web.scm (nginx-shepherd-service): Use the simpler "nginx-action" helper, for the same reload side-effect. --- gnu/services/web.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 227a577de3..7fde8824b3 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -820,13 +820,7 @@ (define (nginx-shepherd-service config) (shepherd-action (name 'reload) (documentation "Reload NGINX configuration file and restart worker processes.") - (procedure - #~(lambda (pid) - (if pid - (begin - (kill pid SIGHUP) - (format #t "Service NGINX (PID ~a) has been reloaded." pid)) - (format #t "Service NGINX is not running.")))))))))))) + (procedure (nginx-action "-s" "reload")))))))))) (define nginx-service-type (service-type (name 'nginx)