diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-08 21:12:52 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-08 21:12:52 +0200 |
| commit | 884548b476f2ee27c01cb0c9ad93c0cf9d33fa5e (patch) | |
| tree | 20650b3917b1292470ecc4ded13fbb04e5dbfa6d /gnu/services | |
| parent | 0e305798454c558ab6e722cf66ba351c326a1a8d (diff) | |
| parent | fa894b3f4db835bd0bb52b32c7ec412e72b7e03a (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 2 | ||||
| -rw-r--r-- | gnu/services/desktop.scm | 6 | ||||
| -rw-r--r-- | gnu/services/web.scm | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index bb11732de29..616bc42e696 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -880,7 +880,7 @@ the message of the day, among other things." (default #f)) (no-hints? agetty-no-hints? ;Boolean (default #f)) - (no-hostname? agetty-no hostname? ;Boolean + (no-hostname? agetty-no-hostname? ;Boolean (default #f)) (long-hostname? agetty-long-hostname? ;Boolean (default #f)) 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)) |