04/06: services: web: Fix nginx-service-type's ‘file’ procedure.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 352a5b639b2adfa343f5a786529bb112636757ea
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Tue Sep 5 18:54:08 2017 +0200

    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.
---
 doc/guix.texi        | 12 ++++++------
 gnu/services/web.scm |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0a18f71..3e9593d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -39,7 +39,8 @@ Copyright @copyright{} 2017 address@hidden
 Copyright @copyright{} 2017 Christopher Allan address@hidden
 Copyright @copyright{} 2017 Marius address@hidden
 Copyright @copyright{} 2017 Hartmut address@hidden
-Copyright @copyright{} 2017 Maxim Cournoyer
+Copyright @copyright{} 2017 Maxim address@hidden
+Copyright @copyright{} 2017 Tobias Geerinckx-Rice
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -14139,13 +14140,12 @@ requests with two servers.
                              "server2.example.com")))))))
 @end example
 
address@hidden @code{config-file} (default: @code{#f})
-If the @var{config-file} is provided, this will be used, rather than
address@hidden @code{file} (default: @code{#f})
+If a configuration @var{file} is provided, this will be used, rather than
 generating a configuration file from the provided @code{log-directory},
 @code{run-directory}, @code{server-list} and @code{upstream-list}.  For
-proper operation, these arguments should match what is in
address@hidden to ensure that the directories are created when the
-service is activated.
+proper operation, these arguments should match what is in @var{file} to
+ensure that the directories are created when the service is activated.
 
 This can be useful if you have an existing configuration file, or it's
 not possible to do what is required through the other parts of the
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 1827850..4aa6fd5 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))
                              address@hidden))))))