[debbugs-tracker] bug#29633: closed ([PATCH] services: nginx: Allow to add raw content to the server blocks.)

[GNU bug Tracking System]

Your message dated Mon, 18 Dec 2017 12:07:05 +0100
with message-id <address@hidden>
and subject line Re: [bug#29633] [PATCH] services: nginx: Allow to add raw 
content to the server blocks.
has caused the debbugs.gnu.org bug report #29633,
regarding [PATCH] services: nginx: Allow to add raw content to the server 
blocks.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
29633: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29633
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: nginx: Allow to add raw content to the server blocks.
>
>
>
>
> Date: 
>
> Sat,  9 Dec 2017 23:55:04 +0100
>
>
>
>
> * doc/guix.texi (Web Services): Document 'raw-content'.
> * gnu/services/web.scm (<nginx-server-configuration>)[raw-content]: New field.
> (emit-nginx-server-config): Add it.
> ---
>  doc/guix.texi        | 3 +++
>  gnu/services/web.scm | 9 +++++++--
>  2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index ab1e5d057..09017ec65 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -14974,6 +14974,9 @@ you don't have a key or you don't want to use HTTPS.
>  @item @code{server-tokens?} (default: @code{#f})
>  Whether the server should add its configuration to response.
>  
> address@hidden @code{raw-content} (default: @code{'()})
> +A list of raw lines added to the server block.
> +
>  @end table
>  @end deftp
>  
> diff --git a/gnu/services/web.scm b/gnu/services/web.scm
> index 7373d5671..78a6ad309 100644
> --- a/gnu/services/web.scm
> +++ b/gnu/services/web.scm
> @@ -52,6 +52,7 @@
>              nginx-server-configuration-ssl-certificate
>              nginx-server-configuration-ssl-certificate-key
>              nginx-server-configuration-server-tokens?
> +            nginx-server-configuration-raw-content
>  
>              <nginx-upstream-configuration>
>              nginx-upstream-configuration
> @@ -104,7 +105,9 @@
>    (ssl-certificate-key nginx-server-configuration-ssl-certificate-key
>                         (default "/etc/nginx/key.pem"))
>    (server-tokens?      nginx-server-configuration-server-tokens?
> -                       (default #f)))
> +                       (default #f))
> +  (raw-content         nginx-server-configuration-raw-content
> +                       (default '())))
>  
>  (define-record-type* <nginx-upstream-configuration>
>    nginx-upstream-configuration make-nginx-upstream-configuration
> @@ -180,7 +183,8 @@ of index files."
>          (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)))
> +        (locations (nginx-server-configuration-locations server))
> +        (raw-content (nginx-server-configuration-raw-content server)))
>      (define-syntax-parameter <> (syntax-rules ()))
>      (define-syntax-rule (and/l x tail ...)
>        (let ((x* x))
> @@ -213,6 +217,7 @@ of index files."
>       "\n"
>       (map emit-nginx-location-config locations)
>       "\n"
> +     (map (lambda (x) (list "      " x "\n")) raw-content)
>       "    }\n")))
>  
>  (define (emit-nginx-upstream-config upstream)
> -- 
> 2.15.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#29633] [PATCH] services: nginx: Allow to add raw content to the server blocks.
>
>
>
>
> Date: 
>
> Mon, 18 Dec 2017 12:07:05 +0100
>
>
>
>
> User-agent: 
>
> mu4e 0.9.18; emacs 25.3.1
>
>
>
>
> Christopher Baines <address@hidden> writes:
>
> > Clément Lassieur <address@hidden> writes:
> >
> >> * doc/guix.texi (Web Services): Document 'raw-content'.
> >> * gnu/services/web.scm (<nginx-server-configuration>)[raw-content]: New 
> >> field.
> >> (emit-nginx-server-config): Add it.
> >
> > This looks good to me :) I was writing a service for the Apache web
> > server recently, and ended up adding something very similar there [1].
> >
> > 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29741
>
> I pushed it.  Thank you!
>
>
> --- End Message ---