unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: "Andy Wingo" <wingo@igalia.com>,
	"Clément Lassieur" <clement@lassieur.org>,
	26684-done@debbugs.gnu.org
Subject: bug#26684: let nginx configs reference the store
Date: Thu, 17 Aug 2017 18:35:36 +0100	[thread overview]
Message-ID: <20170817183536.1c9b701b@cbaines.net> (raw)
In-Reply-To: <20170802162304.0f9e9253@cbaines.net>

[-- Attachment #1: Type: text/plain, Size: 1925 bytes --]

On Wed, 2 Aug 2017 16:23:03 +0100
Christopher Baines <mail@cbaines.net> wrote:

> On Wed, 02 Aug 2017 11:31:41 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
> 
> > Hello,
> > 
> > Christopher Baines <mail@cbaines.net> skribis:
> >   
> > > On Mon, 24 Jul 2017 15:01:42 +0200
> > > ludo@gnu.org (Ludovic Courtès) wrote:
> > >    
> > >> Hello!
> > >> 
> > >> Christopher, Clément: 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?
> > >> 
> > >>   https://bugs.gnu.org/26684    
> > >
> > > 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.    
> > 
> > As long as “make check-system TESTS=nginx” doesn’t catch obvious
> > errors, it’s probably fine.
> > 
> > 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

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.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

  reply	other threads:[~2017-08-17 17:36 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-27 20:08 bug#26684: let nginx configs reference the store Andy Wingo
2017-05-03 12:43 ` Ludovic Courtès
2017-05-03 22:58 ` Clément Lassieur
2017-07-24 13:01   ` [bug#26684] " Ludovic Courtès
2017-07-24 13:11     ` Clément Lassieur
2017-08-02  7:45     ` Christopher Baines
2017-08-02  9:31       ` Ludovic Courtès
2017-08-02 15:20         ` [bug#26684] [PATCH 1/2] gnu: services: Nginx configs can reference store Christopher Baines
2017-08-02 15:20           ` [bug#26684] [PATCH 2/2] web: Check for the existance of SSL related files Christopher Baines
2017-08-02 15:23         ` [bug#26684] let nginx configs reference the store Christopher Baines
2017-08-17 17:35           ` Christopher Baines [this message]
2017-08-21 10:31             ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170817183536.1c9b701b@cbaines.net \
    --to=mail@cbaines.net \
    --cc=26684-done@debbugs.gnu.org \
    --cc=clement@lassieur.org \
    --cc=ludo@gnu.org \
    --cc=wingo@igalia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).