From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvtQz-00010F-T3 for guix-patches@gnu.org; Sat, 23 Sep 2017 19:02:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvtQw-0004pX-Q1 for guix-patches@gnu.org; Sat, 23 Sep 2017 19:02:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:46320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvtQw-0004pR-K0 for guix-patches@gnu.org; Sat, 23 Sep 2017 19:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dvtQw-0002IA-3R for guix-patches@gnu.org; Sat, 23 Sep 2017 19:02:02 -0400 Subject: [bug#28560] [PATCH] web: Add try-files for the nginx-service-type. Resent-Message-ID: From: Oleg Pykhalov References: <874lruckq8.fsf@gmail.com> <87k20prshw.fsf@gmail.com> <87h8vtrrlz.fsf@gmail.com> Date: Sun, 24 Sep 2017 02:01:21 +0300 In-Reply-To: <87h8vtrrlz.fsf@gmail.com> (Oleg Pykhalov's message of "Sun, 24 Sep 2017 01:13:12 +0300") Message-ID: <87d16hrpdq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: 28560@debbugs.gnu.org --=-=-= Content-Type: text/plain Fix failed test. --8<---------------cut here---------------start------------->8--- guix environment guix -- make check-system TESTS=nginx --8<---------------cut here---------------end--------------->8--- And system build is fine, too. --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix system build ~/dotfiles/guix/system-magnolia.scm --8<---------------cut here---------------end--------------->8--- --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-web-Add-try-files-for-the-nginx-service-type.patch >From 20e411b4d3513106de43980afd46a71fea4cf107 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 23 Sep 2017 03:27:49 +0300 Subject: [PATCH] web: Add try-files for the nginx-service-type. * gnu/services/web.scm (): Add nginx-server-configuration-try-files. (emit-nginx-server-config): Add this. --- gnu/services/web.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 4aa6fd501..9d713003c 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -99,6 +99,8 @@ (default '())) (index nginx-server-configuration-index (default (list "index.html"))) + (try-files nginx-server-configuration-try-files + (default '())) (ssl-certificate nginx-server-configuration-ssl-certificate (default "/etc/nginx/cert.pem")) (ssl-certificate-key nginx-server-configuration-ssl-certificate-key @@ -179,6 +181,7 @@ of index files." (nginx-server-configuration-ssl-certificate-key server)) (root (nginx-server-configuration-root server)) (index (nginx-server-configuration-index server)) + (try-files (nginx-server-configuration-try-files server)) (server-tokens? (nginx-server-configuration-server-tokens? server)) (locations (nginx-server-configuration-locations server))) (define-syntax-parameter <> (syntax-rules ())) @@ -207,6 +210,9 @@ of index files." (and/l ssl-certificate-key " ssl_certificate_key " <> ";\n") " root " root ";\n" " index " (config-index-strings index) ";\n" + (if (not (nil? try-files)) + (and/l (config-index-strings try-files) " try_files " <> ";\n") + "") " server_tokens " (if server-tokens? "on" "off") ";\n" "\n" (map emit-nginx-location-config locations) -- 2.14.1 --=-=-=--