services: nginx: Use a fixed location for the nginx configuration file.

The motivation is twofold:

 1. We can ensure the presence of the nginx default configuration fragments in
    the configuration file directory;
 2. 'herd reload nginx' can now be used to reload an updated configuration
    file.

Before this change, 'include fastcgi_params;', for example, would fail with
error:

  nginx: [emerg] open() "/gnu/store/fastcgi_params" failed
  (2: No such file or directory) in /gnu/store/...-nginx.conf:50

* gnu/services/web.scm (%nginx-configuration-file): New variable.
(nginx-activation): Delay configuration file check to...
(nginx-shepherd-service): ... a new one-shot 'nginx-init' service.  Adjust to
use the %nginx-configuration-file variable for the configuration file.
<actions>: Add a new 'configuration' action.
(nginx-conf-files, nginx-etc-directory): New procedures.
(nginx-service-type): Extend etc-service-type with nginx-service-type.
* gnu/tests/web.scm (%nginx-servers): Add an include directive to test config
to ensure it now works.

Merges: !8811
Change-Id: I26882ab01288ec4dd374e9f282e95ffa33dfa3cc

1 files changed, 14 insertions, 1 deletions

diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index f29fb6b3748..c3253652887 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -203,8 +203,21 @@ the tests."
 (define %nginx-servers
   ;; Server blocks.
   (list (nginx-server-configuration
-         (listen '("8080")))))
+          (listen '("8080"))
+          (locations
+           ;; Dummy location to test the default configuration path.
+           (list (nginx-location-configuration
+                  (uri "/")
+                  (body (list "include fastcgi_params;"))))))))
 
+;;; For a manual test/inspection:
+#;(
+
+$(./pre-inst-env guix system vm \
+-e '(@@ (gnu tests web) %nginx-os)' --no-graphic) \
+-nic user,model=virtio-net-pci,hostfwd=tcp::8080-:80 -m 1024
+
+)
 (define %nginx-os
   ;; Operating system under test.
   (simple-operating-system