ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: nginx: Add 'shepherd-requirement' configuration field.

Browse source 
* gnu/services/web.scm (<nginx-configuration>)[shepherd-requirement]:
New field.
(nginx-shepherd-service): Honor it.
* doc/guix.texi (Web Services): Document it.
This commit is contained in:
Ludovic Courtès 2022-09-06 16:12:56 +02:00
parent 61b63e7fa7
commit 8c5065c6d1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/guix.texi
View file

@ -28841,6 +28841,14 @@ types, or alternatively, a config file can be provided.
@item @code{nginx} (default: @code{nginx}) @item @code{nginx} (default: @code{nginx})
The nginx package to use. The nginx package to use.
@item @code{shepherd-requirement} (default: @code{'()})
This is a list of symbols naming Shepherd services the nginx service
will depend on.
This is useful if you would like @command{nginx} to be started after a
back-end web server or a logging service such as Anonip has been
started.
@item @code{log-directory} (default: @code{"/var/log/nginx"}) @item @code{log-directory} (default: @code{"/var/log/nginx"})
The directory to which NGinx will write log files. The directory to which NGinx will write log files.

7
gnu/services/web.scm
View file

@ -93,6 +93,7 @@ (define-module (gnu services web)
nginx-configuration nginx-configuration
nginx-configuration? nginx-configuration?
nginx-configuration-nginx nginx-configuration-nginx
nginx-configuration-shepherd-requirement
nginx-configuration-log-directory nginx-configuration-log-directory
nginx-configuration-run-directory nginx-configuration-run-directory
nginx-configuration-server-blocks nginx-configuration-server-blocks
@ -556,6 +557,8 @@ (define-record-type* <nginx-configuration>
nginx-configuration? nginx-configuration?
(nginx nginx-configuration-nginx ;file-like (nginx nginx-configuration-nginx ;file-like
(default nginx)) (default nginx))
(shepherd-requirement nginx-configuration-shepherd-requirement
(default '())) ;list of symbols
(log-directory nginx-configuration-log-directory ;string (log-directory nginx-configuration-log-directory ;string
(default "/var/log/nginx")) (default "/var/log/nginx"))
(run-directory nginx-configuration-run-directory ;string (run-directory nginx-configuration-run-directory ;string
@ -779,7 +782,7 @@ (define (nginx-activation config)
(define (nginx-shepherd-service config) (define (nginx-shepherd-service config)
(match-record config (match-record config
<nginx-configuration> <nginx-configuration>
(nginx file run-directory) (nginx file run-directory shepherd-requirement)
(let* ((nginx-binary (file-append nginx "/sbin/nginx")) (let* ((nginx-binary (file-append nginx "/sbin/nginx"))
(pid-file (in-vicinity run-directory "pid")) (pid-file (in-vicinity run-directory "pid"))
(nginx-action (nginx-action
@ -803,7 +806,7 @@ (define (nginx-shepherd-service config)
(list (shepherd-service (list (shepherd-service
(provision '(nginx)) (provision '(nginx))
(documentation "Run the nginx daemon.") (documentation "Run the nginx daemon.")
(requirement '(user-processes loopback)) (requirement `(user-processes loopback ,@shepherd-requirement))
(modules `((ice-9 match) (modules `((ice-9 match)
,@%default-modules)) ,@%default-modules))
(start (nginx-action "-p" run-directory)) (start (nginx-action "-p" run-directory))