diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
| commit | 1a8f7a0f584e5dd6e8f1a379b92f689b71902295 (patch) | |
| tree | 8586450fc3068b217e60a7e942fa4c7d89ad74e7 /gnu/services | |
| parent | 19d42e0e23a7f90ac2dcc1c279bd23a967ff0314 (diff) | |
| parent | 2a4f3c1711fdb947e615b5a89e285421b3bf0925 (diff) | |
| download | guix-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.tar.gz guix-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/docker.scm | 6 | ||||
| -rw-r--r-- | gnu/services/web.scm | 27 |
2 files changed, 26 insertions, 7 deletions
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index e23014213b..7acfbea49f 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -84,7 +84,8 @@ loop-back communications.") (define (containerd-shepherd-service config) (let* ((package (docker-configuration-containerd config)) - (debug? (docker-configuration-debug? config))) + (debug? (docker-configuration-debug? config)) + (containerd (docker-configuration-containerd config))) (shepherd-service (documentation "containerd daemon.") (provision '(containerd)) @@ -93,6 +94,9 @@ loop-back communications.") #$@(if debug? '("--log-level=debug") '())) + ;; For finding containerd-shim binary. + #:environment-variables + (list (string-append "PATH=" #$containerd "/bin")) #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index c8ffc19d83..a74c6c54b4 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,7 +91,7 @@ nginx-configuration nginx-configuration? - nginx-configuartion-nginx + nginx-configuration-nginx nginx-configuration-log-directory nginx-configuration-run-directory nginx-configuration-server-blocks @@ -525,6 +526,10 @@ (modules nginx-configuration-modules (default '())) (global-directives nginx-configuration-global-directives (default '((events . ())))) + (lua-package-path nginx-lua-package-path ;list of <package> + (default #f)) + (lua-package-cpath nginx-lua-package-cpath ;list of <package> + (default #f)) (extra-content nginx-configuration-extra-content (default "")) (file nginx-configuration-file ;#f | string | file-like @@ -630,6 +635,8 @@ of index files." server-names-hash-bucket-max-size modules global-directives + lua-package-path + lua-package-cpath extra-content) (apply mixed-text-file "nginx.conf" (flatten @@ -646,11 +653,19 @@ of index files." " scgi_temp_path " run-directory "/scgi_temp;\n" " access_log " log-directory "/access.log;\n" " include " nginx "/share/nginx/conf/mime.types;\n" - (if server-names-hash-bucket-size - (string-append - " server_names_hash_bucket_size " - (number->string server-names-hash-bucket-size) - ";\n") + (if lua-package-path + #~(format #f " lua_package_path ~s;~%" + (string-join (map (lambda (path) + (string-append path "/lib/?.lua")) + '#$lua-package-path) + ";")) + "") + (if lua-package-cpath + #~(format #f " lua_package_cpath ~s;~%" + (string-join (map (lambda (cpath) + (string-append cpath "/lib/lua/?.lua")) + '#$lua-package-cpath) + ";")) "") (if server-names-hash-bucket-max-size (string-append |