From 47652425400281f48a399938585dd103f8de3586 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Sep 2022 23:46:22 +0200 Subject: services: upower: Update default percentage values. These values are those used by default by UPower 0.99.15. * gnu/services/desktop.scm ()[percentage-low] [percentage-critical]: Increase. * doc/guix.texi (Desktop Services): Update accordingly. --- gnu/services/desktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index f60365abacc..6bad2b5ecdb 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -205,9 +205,9 @@ (use-percentage-for-policy? upower-configuration-use-percentage-for-policy? (default #f)) (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 -- cgit v1.3 From eedf71f94807e528ae64c51eda8186f7e48416cc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Sep 2022 23:48:37 +0200 Subject: services: upower: Default to a percentage-based policy. This is the documented default of UPower 0.99.15 (the actual default appears to be #f though). * gnu/services/desktop.scm () [use-percentage-for-policy?]: Default to #t. * doc/guix.texi (Desktop Services): Adjust accordingly. Explain the tradeoff. --- doc/guix.texi | 7 ++++--- gnu/services/desktop.scm | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/services') diff --git a/doc/guix.texi b/doc/guix.texi index e111801e67a..95b4fb1b2cd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22756,9 +22756,10 @@ Enable polling the kernel for battery level changes. @item @code{ignore-lid?} (default: @code{#f}) Ignore the lid state, this can be useful if it's incorrect on a device. -@item @code{use-percentage-for-policy?} (default: @code{#f}) -Whether battery percentage based policy should be used. The default is to use -the time left, change to @code{#t} to use the percentage. +@item @code{use-percentage-for-policy?} (default: @code{#t}) +Whether a to use a policy based on battery percentage rather than on +estimated time left. A policy based on battery percentage is usually +more reliable. @item @code{percentage-low} (default: @code{20}) When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 6bad2b5ecdb..07e7500847f 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -203,7 +203,7 @@ (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 20)) (percentage-critical upower-configuration-percentage-critical -- cgit v1.3 From 8c5065c6d1036012996e4812788e48ca74bc1294 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Sep 2022 16:12:56 +0200 Subject: services: nginx: Add 'shepherd-requirement' configuration field. * gnu/services/web.scm ()[shepherd-requirement]: New field. (nginx-shepherd-service): Honor it. * doc/guix.texi (Web Services): Document it. --- doc/guix.texi | 8 ++++++++ gnu/services/web.scm | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/services') diff --git a/doc/guix.texi b/doc/guix.texi index d573695e72e..20abfee7727 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28841,6 +28841,14 @@ types, or alternatively, a config file can be provided. @item @code{nginx} (default: @code{nginx}) 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"}) The directory to which NGinx will write log files. 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 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)) -- cgit v1.3