guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/04: services: nginx: Add support for 'location' blocks.


From: Ludovic Courtès
Subject: 02/04: services: nginx: Add support for 'location' blocks.
Date: Thu, 19 Jan 2017 13:45:19 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit 9c557a69aebe49bba12009a01cfaabf88ec3f665
Author: Christopher Baines <address@hidden>
Date:   Wed Jan 18 08:08:07 2017 +0000

    services: nginx: Add support for 'location' blocks.
    
    * gnu/services/web.scm (<nginx-server-configuration>): Add field 
'locations'.
    (<nginx-location-configuration>): New record type.
    (<nginx-named-location-configuration>): New record type.
    (nginx-location-config): New function.
    (default-nginx-server-config): Include locations.
    * doc/guix.texi (Web Services): Document the new 
nginx-location-configuration
    and nginx-named-location-configuration data types, as well as the changes to
    the nginx-server-configuration.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 doc/guix.texi        |   43 +++++++++++++++++++++++++++++++++++++++++++
 gnu/services/web.scm |   39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 256e6f5..7cd9cd0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12380,6 +12380,11 @@ default server for connections matching no other 
server.
 @item @code{root} (default: @code{"/srv/http"})
 Root of the website nginx will serve.
 
address@hidden @code{locations} (default: @code{'()})
+A list of @dfn{nginx-location-configuration} or
address@hidden records to use within this
+server block.
+
 @item @code{index} (default: @code{(list "index.html")})
 Index files to look for when clients ask for a directory.  If it cannot be 
found,
 Nginx will send the list of files in the directory.
@@ -12775,6 +12780,44 @@ explicitly.
 @end table
 @end deftp
 
address@hidden {Data Type} nginx-location-configuration
+Data type representing the configuration of an nginx @code{location}
+block.  This type has the following parameters:
+
address@hidden @asis
address@hidden @code{uri}
+URI which this location block matches.
+
address@hidden body}
address@hidden @code{body}
+Body of the location block, specified as a string. This can contain many
+configuration directives.  For example, to pass requests to a upstream
+server group defined using an @code{nginx-upstream-configuration} block,
+the following directive would be specified in the body @samp{proxy_pass
+http://upstream-name;}.
+
address@hidden table
address@hidden deftp
+
address@hidden {Data Type} nginx-named-location-configuration
+Data type representing the configuration of an nginx named location
+block.  Named location blocks are used for request redirection, and not
+used for regular request processing.  This type has the following
+parameters:
+
address@hidden @asis
address@hidden @code{name}
+Name to identify this location block.
+
address@hidden @code{body}
address@hidden body}, as the body for named location
+blocks can be used in a similar way to the
address@hidden body}.  One restriction is that the
+body of a named location block cannot contain location blocks.
+
address@hidden table
address@hidden deftp
+
 @node Network File System
 @subsubsection Network File System
 @cindex NFS
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 1477bf8..ec30897 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -36,6 +36,10 @@
             nginx-server-configuration?
             nginx-upstream-configuration
             nginx-upstream-configuration?
+            nginx-location-configuration
+            nginx-location-configuration?
+            nginx-named-location-configuration
+            nginx-named-location-configuration?
             nginx-service
             nginx-service-type))
 
@@ -56,6 +60,8 @@
                        (default (list 'default)))
   (root                nginx-server-configuration-root
                        (default "/srv/http"))
+  (locations           nginx-server-configuration-locations
+                       (default '()))
   (index               nginx-server-configuration-index
                        (default (list "index.html")))
   (ssl-certificate     nginx-server-configuration-ssl-certificate
@@ -71,6 +77,20 @@
   (name                nginx-upstream-configuration-name)
   (servers             nginx-upstream-configuration-servers))
 
+(define-record-type* <nginx-location-configuration>
+  nginx-location-configuration make-nginx-location-configuration
+  nginx-location-configuration?
+  (uri                 nginx-location-configuration-uri
+                       (default #f))
+  (body                nginx-location-configuration-body))
+
+(define-record-type* <nginx-named-location-configuration>
+  nginx-named-location-configuration make-nginx-named-location-configuration
+  nginx-named-location-configuration?
+  (name                nginx-named-location-configuration-name
+                       (default #f))
+  (body                nginx-named-location-configuration-body))
+
 (define-record-type* <nginx-configuration>
   nginx-configuration make-nginx-configuration
   nginx-configuration?
@@ -98,6 +118,19 @@ of index files."
         ((? string? str) (string-append str " ")))
        names)))
 
+(define nginx-location-config
+  (match-lambda
+    (($ <nginx-location-configuration> uri body)
+     (string-append
+      "      location " uri " {\n"
+      "        " (string-join body "\n    ") "\n"
+      "      }\n"))
+    (($ <nginx-named-location-configuration> name body)
+     (string-append
+      "      location @" name " {\n"
+      "        " (string-join body "\n    ") "\n"
+      "      }\n"))))
+
 (define (default-nginx-server-config server)
   (string-append
    "    server {\n"
@@ -126,7 +159,11 @@ of index files."
    "      index " (config-index-strings (nginx-server-configuration-index 
server)) ";\n"
    "      server_tokens " (if (nginx-server-configuration-server-tokens? 
server)
                               "on" "off") ";\n"
-    "    }\n"))
+   "\n"
+   (string-join
+    (map nginx-location-config (nginx-server-configuration-locations server))
+    "\n")
+   "    }\n"))
 
 (define (nginx-upstream-config upstream)
   (string-append



reply via email to

[Prev in Thread] Current Thread [Next in Thread]