nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: nginx: Add default values for <nginx-configuration> fields. 

* gnu/services/web.scm (<nginx-configuration>)[nginx, log-directory]
[run-directory, server-blocks, upstream-blocks, file]: Add default
values.
This commit is contained in:
Ludovic Courtès 2017-01-19 14:40:04 +01:00
parent 9c557a69ae
commit dc72a7f7f7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/services/web.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
@ -94,12 +94,18 @@
(define-record-type* <nginx-configuration> (define-record-type* <nginx-configuration>
nginx-configuration make-nginx-configuration nginx-configuration make-nginx-configuration
nginx-configuration? nginx-configuration?
(nginx nginx-configuration-nginx) ;<package> (nginx nginx-configuration-nginx ;<package>
(log-directory nginx-configuration-log-directory) ;string (default nginx))
(run-directory nginx-configuration-run-directory) ;string (log-directory nginx-configuration-log-directory ;string
(server-blocks nginx-configuration-server-blocks) ;list (default "/var/log/nginx"))
(upstream-blocks nginx-configuration-upstream-blocks) ;list (run-directory nginx-configuration-run-directory ;string
(file nginx-configuration-file)) ;string | file-like (default "/var/run/nginx"))
(server-blocks nginx-configuration-server-blocks
(default '())) ;list of <nginx-server-configuration>
(upstream-blocks nginx-configuration-upstream-blocks
(default '())) ;list of <nginx-upstream-configuration>
(file nginx-configuration-file ;#f | string | file-like
(default #f)))
(define (config-domain-strings names) (define (config-domain-strings names)
"Return a string denoting the nginx config representation of NAMES, a list "Return a string denoting the nginx config representation of NAMES, a list