From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 28 17:12:02 2017 Received: (at submit) by debbugs.gnu.org; 28 Aug 2017 21:12:02 +0000 Received: from localhost ([127.0.0.1]:59761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmRKE-0002Mn-7b for submit@debbugs.gnu.org; Mon, 28 Aug 2017 17:12:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmRKC-0002MI-7C for submit@debbugs.gnu.org; Mon, 28 Aug 2017 17:12:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmRK6-0004Nr-63 for submit@debbugs.gnu.org; Mon, 28 Aug 2017 17:11:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54916) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dmRK6-0004Nk-2j for submit@debbugs.gnu.org; Mon, 28 Aug 2017 17:11:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmRK4-0002B1-TC for guix-patches@gnu.org; Mon, 28 Aug 2017 17:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmRK3-0004Mj-LV for guix-patches@gnu.org; Mon, 28 Aug 2017 17:11:52 -0400 Received: from tobias.gr ([2001:470:cc92::1]:46660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dmRK3-0004M2-AW for guix-patches@gnu.org; Mon, 28 Aug 2017 17:11:51 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id d65c8e73 for ; Mon, 28 Aug 2017 21:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=201706; bh=/oP/fBAawiJDyl02Bol5NGV /FLTF4hHwrZdazEA32co=; b=NsozzRLOgRg5apYWTZRQId4ll6ptWgGrNy4P1eW m+f5eDtMG6iurw5VdkA7mMiEOn94p6PLmQ2AiyOCE4GuzsuS+ZLg/4h2DzGAqsxH l7mPmG3Mjoecv4dhxS8FLAQbATawW1xQvqTzDSkktCBBJbGEE1u1u0kvmOOJ1hvc KoMTYQQSBeLEyqUTibPllpQvyhfo8mTKIJ5iOONIdoJ3XFsq/rlpkQCIm3JzEZ1d Ov3visbK/dvoot67vPYd40KVuQq0ET64uwy0fkA6nh3H9N0UqDVVKZVdD6Rr6kir 0iSsCd7Qh3pzCQKebJIfcmPLrJnw0q/XiNj26xend/1PsuA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id de77846d (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for ; Mon, 28 Aug 2017 21:11:43 +0000 (UTC) From: Tobias Geerinckx-Rice To: guix-patches@gnu.org Subject: [PATCH] =?UTF-8?q?services:=20web:=20Fix=20nginx-service-type's?= =?UTF-8?q?=20=E2=80=98file=E2=80=99=20procedure.?= Date: Mon, 28 Aug 2017 23:13:27 +0200 Message-Id: <20170828211327.8050-1-me@tobias.gr> X-Mailer: git-send-email 2.13.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit 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: -4.1 (----) * gnu/services/web.scm (nginx-activation, nginx-shepherd-service): Replace references to non-existent ‘config-file’ with ‘file’. * doc/guix.texi (Web Services): Likewise. --- Guix, This fixes using a ‘native’ nginx configuration file under GuixSD, so I can finally update my web server. I wasn't sure whether to keep the procedure as ‘file’, and fix all references to it, or rename it to ‘configuration-file’. Then Andreas' commit 036cd84 to maintenance rolledin which I took as a pragmatic endorsement of ‘file’. I don't have a strong preference either way. Both are better than the old ‘config-file’, and we have no backwards compatibility to care about. Kind regards, T G-R doc/guix.texi | 12 ++++++------ gnu/services/web.scm | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e8b4d5e08..651cc9aca 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -38,7 +38,8 @@ Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017 Marius Bakke@* -Copyright @copyright{} 2017 Hartmut Goebel +Copyright @copyright{} 2017 Hartmut Goebel@* +Copyright @copyright{} 2017 Tobias Geerinckx-Rice Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -14131,13 +14132,12 @@ requests with two servers. "server2.example.com"))))))) @end example -@item @code{config-file} (default: @code{#f}) -If the @var{config-file} is provided, this will be used, rather than +@item @code{file} (default: @code{#f}) +If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, @code{run-directory}, @code{server-list} and @code{upstream-list}. For -proper operation, these arguments should match what is in -@var{config-file} to ensure that the directories are created when the -service is activated. +proper operation, these arguments should match what is in @var{file} to +ensure that the directories are created when the service is activated. This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 18278502e..4aa6fd501 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -262,7 +262,7 @@ of index files." (define nginx-activation (match-lambda (($ nginx log-directory run-directory server-blocks - upstream-blocks config-file) + upstream-blocks file) #~(begin (use-modules (guix build utils)) @@ -281,7 +281,7 @@ of index files." (mkdir-p (string-append #$run-directory "/logs")) ;; Check configuration file syntax. (system* (string-append #$nginx "/sbin/nginx") - "-c" #$(or config-file + "-c" #$(or file (default-nginx-config nginx log-directory run-directory server-blocks upstream-blocks)) "-t"))))) @@ -289,14 +289,14 @@ of index files." (define nginx-shepherd-service (match-lambda (($ nginx log-directory run-directory server-blocks - upstream-blocks config-file) + upstream-blocks file) (let* ((nginx-binary (file-append nginx "/sbin/nginx")) (nginx-action (lambda args #~(lambda _ (zero? (system* #$nginx-binary "-c" - #$(or config-file + #$(or file (default-nginx-config nginx log-directory run-directory server-blocks upstream-blocks)) #$@args)))))) -- 2.13.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 05 14:57:04 2017 Received: (at 28269-done) by debbugs.gnu.org; 5 Sep 2017 18:57:04 +0000 Received: from localhost ([127.0.0.1]:51813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpJ20-0003aE-Nv for submit@debbugs.gnu.org; Tue, 05 Sep 2017 14:57:04 -0400 Received: from tobias.gr ([51.15.135.5]:54892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpJ1z-0003Zw-FI for 28269-done@debbugs.gnu.org; Tue, 05 Sep 2017 14:57:03 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id dce26429 for <28269-done@debbugs.gnu.org>; Tue, 5 Sep 2017 18:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=to:from :subject:message-id:date:mime-version:content-type :content-transfer-encoding; s=201706; bh=VVq+h8jXkV+MBeouq2MXGAi NS01Tjvr0RhG71JqezJ4=; b=LN6H1Ca/pk2jTHF2r7IZaRWmzmNPvephbuL6nhh YUszlRbm8plRbDQur0YHxGanDQb5zILazoyo4UO86I5LNIxCRkT7AV3WQ1H+k2ya reFZvGnuczFgyw1+Pqb1KKCBw2TDFwi5qHTN8utaC87f2Jeu1p9ivtcsmrZDHYkN zaThRwGXRFiRbm4IPXnARoTADRhey3t+pDowd9MILv5Kd93T9IlMtAOuZSxi62sj aKXPLWFGxirKz71KY5wTgguZ3JzhoycrmKRso3kesGiBhD5s7jALgEieOrhxYg3y kkMTfLsr1665DknSlJZyf1kq/IYa0j4jqofSV701+2icSbA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id c7e36c1c (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for <28269-done@debbugs.gnu.org>; Tue, 5 Sep 2017 18:57:00 +0000 (UTC) To: 28269-done@debbugs.gnu.org From: Tobias Geerinckx-Rice Subject: =?UTF-8?Q?[PATCH]_services:_web:_Fix_nginx-service-type's_=e2=80=98?= =?UTF-8?Q?file=e2=80=99_procedure.?= Message-ID: <884e6d33-a558-1e0b-f684-d3a0996b5496@tobias.gr> Date: Tue, 5 Sep 2017 20:58:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 28269-done 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 (--) Pushed. From unknown Thu Sep 11 06:07:35 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 04 Oct 2017 11:24:07 +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