[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: services: nginx: Add default values for <nginx-configuration> fie
From: |
Ludovic Courtès |
Subject: |
03/04: services: nginx: Add default values for <nginx-configuration> fields. |
Date: |
Thu, 19 Jan 2017 13:45:19 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit dc72a7f7f7bddb9c7ed377a8e16179a7a8a37af5
Author: Ludovic Courtès <address@hidden>
Date: Thu Jan 19 14:40:04 2017 +0100
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.
---
gnu/services/web.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index ec30897..11408d7 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <address@hidden>
-;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
;;; Copyright © 2016 Julien Lepiller <address@hidden>
;;; Copyright © 2017 Christopher Baines <address@hidden>
@@ -94,12 +94,18 @@
(define-record-type* <nginx-configuration>
nginx-configuration make-nginx-configuration
nginx-configuration?
- (nginx nginx-configuration-nginx) ;<package>
- (log-directory nginx-configuration-log-directory) ;string
- (run-directory nginx-configuration-run-directory) ;string
- (server-blocks nginx-configuration-server-blocks) ;list
- (upstream-blocks nginx-configuration-upstream-blocks) ;list
- (file nginx-configuration-file)) ;string | file-like
+ (nginx nginx-configuration-nginx ;<package>
+ (default nginx))
+ (log-directory nginx-configuration-log-directory ;string
+ (default "/var/log/nginx"))
+ (run-directory nginx-configuration-run-directory ;string
+ (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)
"Return a string denoting the nginx config representation of NAMES, a list