diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
| commit | 6cfb2e6270b2759fb98a0de665235bcbb9b9eccf (patch) | |
| tree | 83c467772a94cbf72f96b26b08f0a29d1822b1c1 /gnu/services | |
| parent | 92fdda5a6351dd5246b65165547d50d0b827cef3 (diff) | |
| parent | 453e7dd8c4b9422a7c80e3b3e75589b6471f5af1 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/desktop.scm | 6 | ||||
| -rw-r--r-- | gnu/services/web.scm | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index f60365abacc..07e7500847f 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -203,11 +203,11 @@ (ignore-lid? upower-configuration-ignore-lid? (default #f)) (use-percentage-for-policy? upower-configuration-use-percentage-for-policy? - (default #f)) + (default #t)) (percentage-low upower-configuration-percentage-low - (default 10)) + (default 20)) (percentage-critical upower-configuration-percentage-critical - (default 3)) + (default 5)) (percentage-action upower-configuration-percentage-action (default 2)) (time-low upower-configuration-time-low diff --git a/gnu/services/web.scm b/gnu/services/web.scm index f0c7e90cbfb..b144cf70762 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -93,6 +93,7 @@ nginx-configuration nginx-configuration? nginx-configuration-nginx + nginx-configuration-shepherd-requirement nginx-configuration-log-directory nginx-configuration-run-directory nginx-configuration-server-blocks @@ -556,6 +557,8 @@ nginx-configuration? (nginx nginx-configuration-nginx ;file-like (default nginx)) + (shepherd-requirement nginx-configuration-shepherd-requirement + (default '())) ;list of symbols (log-directory nginx-configuration-log-directory ;string (default "/var/log/nginx")) (run-directory nginx-configuration-run-directory ;string @@ -779,7 +782,7 @@ of index files." (define (nginx-shepherd-service config) (match-record config <nginx-configuration> - (nginx file run-directory) + (nginx file run-directory shepherd-requirement) (let* ((nginx-binary (file-append nginx "/sbin/nginx")) (pid-file (in-vicinity run-directory "pid")) (nginx-action @@ -803,7 +806,7 @@ of index files." (list (shepherd-service (provision '(nginx)) (documentation "Run the nginx daemon.") - (requirement '(user-processes loopback)) + (requirement `(user-processes loopback ,@shepherd-requirement)) (modules `((ice-9 match) ,@%default-modules)) (start (nginx-action "-p" run-directory)) |