From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJEku-0006Xw-PU for guix-patches@gnu.org; Mon, 27 Nov 2017 03:27:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJEkp-0004Wq-SN for guix-patches@gnu.org; Mon, 27 Nov 2017 03:27:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJEkp-0004Wm-Oa for guix-patches@gnu.org; Mon, 27 Nov 2017 03:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eJEkp-0000rk-Fm for guix-patches@gnu.org; Mon, 27 Nov 2017 03:27:03 -0500 Subject: [bug#29467] [PATCH] web: Don't error about missing ssl related files. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJEkE-0006Nc-Kt for guix-patches@gnu.org; Mon, 27 Nov 2017 03:26:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJEk9-0004GZ-NL for guix-patches@gnu.org; Mon, 27 Nov 2017 03:26:26 -0500 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:39411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJEk9-0004GV-H4 for guix-patches@gnu.org; Mon, 27 Nov 2017 03:26:21 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id F3A2B13E819 for ; Mon, 27 Nov 2017 08:26:20 +0000 (GMT) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f8f28f6b for ; Mon, 27 Nov 2017 08:26:20 +0000 (UTC) From: Christopher Baines Date: Mon, 27 Nov 2017 08:26:20 +0000 Message-Id: <20171127082620.19237-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29467@debbugs.gnu.org Erroring here prevents doing things like building a system using nginx on a different machine from where it's intended to be deployed, or creating containers and VMs that use the ssl-certificate parts of the nginx configuration, without also getting these files to exist. * gnu/services/web.scm (emit-nginx-server-config): Don't error on missing ssl related files. --- gnu/services/web.scm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 9d713003c..1af32278c 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -191,16 +191,6 @@ of index files." (syntax-parameterize ((<> (identifier-syntax x*))) (list tail ...)) '()))) - (for-each - (match-lambda - ((record-key . file) - (if (and file (not (file-exists? file))) - (error - (simple-format - #f - "~A in the nginx configuration for the server with name \"~A\" does not exist" record-key server-name))))) - `(("ssl-certificate" . ,ssl-certificate) - ("ssl-certificate-key" . ,ssl-certificate-key))) (list " server {\n" (and/l http-port " listen " (number->string <>) ";\n") -- 2.14.2