From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcvVF-0006Tm-9D for guix-patches@gnu.org; Wed, 02 Aug 2017 11:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcvVC-0001i9-1l for guix-patches@gnu.org; Wed, 02 Aug 2017 11:24:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dcvVB-0001i4-UC for guix-patches@gnu.org; Wed, 02 Aug 2017 11:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dcvVB-0006RF-OG for guix-patches@gnu.org; Wed, 02 Aug 2017 11:24:01 -0400 Subject: [bug#26684] let nginx configs reference the store Resent-Message-ID: Date: Wed, 2 Aug 2017 16:23:03 +0100 From: Christopher Baines Message-ID: <20170802162304.0f9e9253@cbaines.net> In-Reply-To: <87o9rytiwy.fsf@gnu.org> References: <87pofp7dk5.fsf@lassieur.org> <87wp6ykmyx.fsf@gnu.org> <20170802084518.4e4f1d7b@cbaines.net> <87o9rytiwy.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/Yi3Xs006X+.svHB=b.=yYiq"; 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 , 26684@debbugs.gnu.org, =?UTF-8?Q?Cl=C3=A9ment?= Lassieur --Sig_/Yi3Xs006X+.svHB=b.=yYiq Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, 02 Aug 2017 11:31:41 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > 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! Yep, that test passes fine. 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. I've also improved the error message since the first patch, so it will say something like: ERROR: ssl-certificate in the nginx configuration for the server with name "(default)" does not exist --Sig_/Yi3Xs006X+.svHB=b.=yYiq Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlmB7lhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfWQw/7Beq7u/ZOBqOANsRRL6+Zag3kXawZVGOsLyOBe9B1rO4RpEXRf2rNDfTR dXxhMDlddmTmuToeKUtWHfqyKwmpgLO+AawsfYloyjCCD/zrb20FvODaGXIuWRYI RLTOhhOxtdd4j7Cve5XMaTKy1H7p/VnYmSVbvcAawPApOJHikaz+E6+VVhoi6s0j mf1sKaZaxqIiR8pXRCf6IGmIG2hfYGuieK1RY3X8PLdJJutblOwNijNXYoEEPOi0 HNp8PGIWVLihIfjBLtJ4OzhxSmcrrlNNC82zOsEqJ6YiXxYTGjypt9OJtKYCcgjN e+c+tVVnYWRrCQMJhvVN6UTNX/o6ufAJFEIhyS/PL6ds/g7Ad+DlCTmHn4etMHHn sPzjOTnDKL7G81fVgQTLbsD68kN/SEC0vwi9k27v9xPg9+kG8fLtxwyUyIM1W+pF Q5M9tT2So5XhiJYKupge3wk4XlRzPixQSDL7tIeXvje+kSUrTdJrd455cvtiagrx F7hnMS4anZ8+DZvzhn1i/UM8dorhYcOtKQwBLenHP8YborjKOYA+/HlkgAOjxFXZ sLdT60fz2ruEPiBjromST5bfF8SqnTGjMzYNw1fD5b5mSGYqQC5LtirL0t2TCi1f pKLz0abqQv2TIApAir2UNwApQPbBm2LdUa8hDkmUbWC8/wbGtU4= =yl0H -----END PGP SIGNATURE----- --Sig_/Yi3Xs006X+.svHB=b.=yYiq--