aboutsummaryrefslogtreecommitdiff
path: root/gnu/services/web.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2017-09-05 18:54:08 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2017-09-05 20:57:14 +0200
commit352a5b639b2adfa343f5a786529bb112636757ea (patch)
tree244630dc08a91dd9f53fbb9bf83579893c274123 /gnu/services/web.scm
parent4695472f8a2ff054da8137df1605b27b3d2bafb7 (diff)
downloadguix-352a5b639b2adfa343f5a786529bb112636757ea.tar
guix-352a5b639b2adfa343f5a786529bb112636757ea.tar.gz
services: web: Fix nginx-service-type's ‘file’ procedure.
* gnu/services/web.scm (nginx-activation, nginx-shepherd-service): Replace references to non-existent ‘config-file’ with ‘file’. * doc/guix.texi (Web Services): Likewise.
Diffstat (limited to 'gnu/services/web.scm')
-rw-r--r--gnu/services/web.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 18278502e4..4aa6fd501c 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -262,7 +262,7 @@ of index files."
(define nginx-activation
(match-lambda
(($ <nginx-configuration> nginx log-directory run-directory server-blocks
- upstream-blocks config-file)
+ upstream-blocks file)
#~(begin
(use-modules (guix build utils))
@@ -281,7 +281,7 @@ of index files."
(mkdir-p (string-append #$run-directory "/logs"))
;; Check configuration file syntax.
(system* (string-append #$nginx "/sbin/nginx")
- "-c" #$(or config-file
+ "-c" #$(or file
(default-nginx-config nginx log-directory
run-directory server-blocks upstream-blocks))
"-t")))))
@@ -289,14 +289,14 @@ of index files."
(define nginx-shepherd-service
(match-lambda
(($ <nginx-configuration> nginx log-directory run-directory server-blocks
- upstream-blocks config-file)
+ upstream-blocks file)
(let* ((nginx-binary (file-append nginx "/sbin/nginx"))
(nginx-action
(lambda args
#~(lambda _
(zero?
(system* #$nginx-binary "-c"
- #$(or config-file
+ #$(or file
(default-nginx-config nginx log-directory
run-directory server-blocks upstream-blocks))
#$@args))))))