From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diOiE-0002FG-DQ for guix-patches@gnu.org; Thu, 17 Aug 2017 13:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diOiB-0005uA-5l for guix-patches@gnu.org; Thu, 17 Aug 2017 13:36:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34385) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1diOiB-0005tj-2b for guix-patches@gnu.org; Thu, 17 Aug 2017 13:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1diOiA-00048T-S3 for guix-patches@gnu.org; Thu, 17 Aug 2017 13:36:02 -0400 Subject: bug#26684: let nginx configs reference the store Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Thu, 17 Aug 2017 18:35:36 +0100 From: Christopher Baines Message-ID: <20170817183536.1c9b701b@cbaines.net> In-Reply-To: <20170802162304.0f9e9253@cbaines.net> References: <87pofp7dk5.fsf@lassieur.org> <87wp6ykmyx.fsf@gnu.org> <20170802084518.4e4f1d7b@cbaines.net> <87o9rytiwy.fsf@gnu.org> <20170802162304.0f9e9253@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/ZelRW52LZve380to1OsutzT"; protocol="application/pgp-signature" 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Andy Wingo , =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , 26684-done@debbugs.gnu.org --Sig_/ZelRW52LZve380to1OsutzT Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, 2 Aug 2017 16:23:03 +0100 Christopher Baines wrote: > On Wed, 02 Aug 2017 11:31:41 +0200 > ludo@gnu.org (Ludovic Court=C3=A8s) wrote: >=20 > > Hello, > >=20 > > Christopher Baines skribis: > > =20 > > > On Mon, 24 Jul 2017 15:01:42 +0200 > > > ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > > > =20 > > >> Hello! > > >>=20 > > >> Christopher, Cl=C3=A9ment: I wanted to apply this patch from Andy but > > >> it conflicts with recent changes, presumably commit cb341293fa by > > >> Chris. Could you take a look and apply it, if possible? > > >>=20 > > >> https://bugs.gnu.org/26684 =20 > > > > > > Hey, > > > > > > So I've had a look at this, it looks like its just the changes > > > that are causing the conflict relate to checking that the files > > > related to SSL exist. > > > > > > I've adjusted the patch so that it applies, and included my > > > translation of the changes. I haven't done much testing yet, but > > > the patch, and the diff with the previous patch is attached. =20 > >=20 > > As long as =E2=80=9Cmake check-system TESTS=3Dnginx=E2=80=9D doesn=E2= =80=99t catch obvious > > errors, it=E2=80=99s probably fine. > >=20 > > Thank you! =20 >=20 > Yep, that test passes fine. >=20 > I've send a couple of updated patches, the first is just the one from > Andy, modified to apply, with the additional validation being re-added > in the second, as I didn't like the idea of just modifying the patch > from Andy with my own additions. >=20 > I've also improved the error message since the first patch, so it will > say something like: >=20 > ERROR: ssl-certificate in the nginx configuration for the server > with name "(default)" does not exist I've got some more improvements I'd like to make to the NGinx service, so to keep things progressing on this, I've merged my adjusted version of the change from Andy, and my additional patch that adds back in the validation. --Sig_/ZelRW52LZve380to1OsutzT Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlmV0+hfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfHsQ//ZiU/+yhkwCCJkJp+2bAWYxVNCfIY9/ZHZFhUIVUHSaz31a+6duPpRmyj 21Q6i2xQUIjTQTHOpL70rN/pXyXAq8fcR5QUnet91j4yYPDoRTXjjraqfMbxnrKy hjlMk7/T+oCNeIwzniBJn4/EUCtwPva6pNExQT5yIJnutZgs/qpteNiEzO1UtIDS PwwnCq2pt/kUOIMrwe5viyPNR+15nIdCj/m7h6N2K9M/O+WWTagFZBndtBOyLBm0 oK6Qg3LfXPg80012n4Yia+en1eWdVNMWJFQp/xLjRXwHit9rbbHSYRmnMC7RqapW 67vdZMfHyIniNUcma4wMA5F3P+EcvFt25DJ92ALAkC+zXRrWXyZr4HKwHTIYYLyM b/V/MQAILC13XDdCbokfMZ4BOwX6R36Pqei9Wkh7Ex0DdAqC5FlePg/kgeWDj9Bn DZQBDoMoz5Drxcxu2LbHzjiafnmJgw/MbJL83AzZu5sztenHQNUC0wjXupw+Px63 9OGBK1qEOCr6XWg4YqM467zS/q0iPH7ffJbDznh7hpAmFWjIiWXFq1VgMNwQQkAk NWEp1di4MQJQbkohjY7yMAWapBkEfyCsj4oh91/ucvQ+kgus9dKGrxNLVMZuvqzf 3mQ8XwKKyJB5d24trIlLj5Am+mHTqHctADmgsSq8oUGbtbNIXj4= =GR8S -----END PGP SIGNATURE----- --Sig_/ZelRW52LZve380to1OsutzT--