diff options
| -rw-r--r-- | doc/guix.texi | 11 | ||||
| -rw-r--r-- | gnu/services/web.scm | 10 |
2 files changed, 13 insertions, 8 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index bb415f2cc59..209becd722a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi | |||
| @@ -53,7 +53,7 @@ Copyright @copyright{} 2017, 2019--2026 Maxim Cournoyer@* | |||
| 53 | Copyright @copyright{} 2017–2022 Tobias Geerinckx-Rice@* | 53 | Copyright @copyright{} 2017–2022 Tobias Geerinckx-Rice@* |
| 54 | Copyright @copyright{} 2017 George Clemmer@* | 54 | Copyright @copyright{} 2017 George Clemmer@* |
| 55 | Copyright @copyright{} 2017 Andy Wingo@* | 55 | Copyright @copyright{} 2017 Andy Wingo@* |
| 56 | Copyright @copyright{} 2017, 2018, 2019, 2020, 2023, 2024, 2025 Arun Isaac@* | 56 | Copyright @copyright{} 2017, 2018, 2019, 2020, 2023, 2024, 2025, 2026 Arun Isaac@* |
| 57 | Copyright @copyright{} 2017 nee@* | 57 | Copyright @copyright{} 2017 nee@* |
| 58 | Copyright @copyright{} 2018 Rutger Helling@* | 58 | Copyright @copyright{} 2018 Rutger Helling@* |
| 59 | Copyright @copyright{} 2018, 2021, 2023, 2025, 2026 Oleg Pykhalov@* | 59 | Copyright @copyright{} 2018, 2021, 2023, 2025, 2026 Oleg Pykhalov@* |
| @@ -36741,13 +36741,16 @@ The Mumi package to use. | |||
| 36741 | Data directory to store Debbugs data from upstream Debbugs instance. | 36741 | Data directory to store Debbugs data from upstream Debbugs instance. |
| 36742 | 36742 | ||
| 36743 | @item @code{rsync-remote} | 36743 | @item @code{rsync-remote} |
| 36744 | Remote rsync path from which to download Debbugs data. The remote is | 36744 | Remote rsync path from which to download Debbugs data. |
| 36745 | polled every 5 minutes, unless a previous instance of rsync is already | ||
| 36746 | running. | ||
| 36747 | 36745 | ||
| 36748 | @item @code{rsync-flags} (default: @code{'()}) | 36746 | @item @code{rsync-flags} (default: @code{'()}) |
| 36749 | Additional flags to pass to @command{rsync}. | 36747 | Additional flags to pass to @command{rsync}. |
| 36750 | 36748 | ||
| 36749 | @item @code{rsync-and-index-event} (default: @code{#~(calendar-event #:minutes '#$(iota 12 0 5))}) | ||
| 36750 | Shepherd calendar event to run the rsync and indexing timer at. By | ||
| 36751 | default, this is once every 5 minutes. The timer job is not run if an | ||
| 36752 | earlier instance of it is still running. | ||
| 36753 | |||
| 36751 | @item @code{mailer?} (default: @code{#true}) | 36754 | @item @code{mailer?} (default: @code{#true}) |
| 36752 | Whether to enable or disable the mailer component. | 36755 | Whether to enable or disable the mailer component. |
| 36753 | 36756 | ||
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 112c4c0af3b..81e6509e085 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm | |||
| @@ -329,6 +329,7 @@ | |||
| 329 | mumi-configuration-data-directory | 329 | mumi-configuration-data-directory |
| 330 | mumi-configuration-rsync-remote | 330 | mumi-configuration-rsync-remote |
| 331 | mumi-configuration-rsync-flags | 331 | mumi-configuration-rsync-flags |
| 332 | mumi-configuration-rsync-and-index-event | ||
| 332 | mumi-configuration-mailer? | 333 | mumi-configuration-mailer? |
| 333 | mumi-configuration-sender | 334 | mumi-configuration-sender |
| 334 | mumi-configuration-smtp | 335 | mumi-configuration-smtp |
| @@ -2355,6 +2356,9 @@ WSGIPassAuthorization On | |||
| 2355 | (rsync-remote mumi-configuration-rsync-remote) | 2356 | (rsync-remote mumi-configuration-rsync-remote) |
| 2356 | (rsync-flags mumi-configuration-rsync-flags | 2357 | (rsync-flags mumi-configuration-rsync-flags |
| 2357 | (default '())) | 2358 | (default '())) |
| 2359 | (rsync-and-index-event mumi-configuration-rsync-and-index-event | ||
| 2360 | ;; Run every 5 minutes by default. | ||
| 2361 | (default #~(calendar-event #:minutes '#$(iota 12 0 5)))) | ||
| 2358 | (mailer? mumi-configuration-mailer? (default #t)) | 2362 | (mailer? mumi-configuration-mailer? (default #t)) |
| 2359 | (sender mumi-configuration-sender (default #f)) | 2363 | (sender mumi-configuration-sender (default #f)) |
| 2360 | (smtp mumi-configuration-smtp (default #f)) | 2364 | (smtp mumi-configuration-smtp (default #f)) |
| @@ -2465,7 +2469,7 @@ WSGIPassAuthorization On | |||
| 2465 | "/lib/locale"))) | 2469 | "/lib/locale"))) |
| 2466 | 2470 | ||
| 2467 | (match-record config <mumi-configuration> | 2471 | (match-record config <mumi-configuration> |
| 2468 | (mumi mailer? sender smtp) | 2472 | (mumi rsync-and-index-event mailer? sender smtp) |
| 2469 | (list (shepherd-service | 2473 | (list (shepherd-service |
| 2470 | (provision '(mumi)) | 2474 | (provision '(mumi)) |
| 2471 | (documentation "Mumi bug-tracking web interface.") | 2475 | (documentation "Mumi bug-tracking web interface.") |
| @@ -2482,9 +2486,7 @@ WSGIPassAuthorization On | |||
| 2482 | (provision '(mumi-rsync-and-index)) | 2486 | (provision '(mumi-rsync-and-index)) |
| 2483 | (modules '((shepherd service timer))) | 2487 | (modules '((shepherd service timer))) |
| 2484 | (start #~(make-timer-constructor | 2488 | (start #~(make-timer-constructor |
| 2485 | ;; Run every 5 minutes, unless an instance of | 2489 | #$rsync-and-index-event |
| 2486 | ;; this job is already running. | ||
| 2487 | (calendar-event #:minutes '#$(iota 12 0 5)) | ||
| 2488 | (command (list #$(mumi-rsync-and-index config))) | 2490 | (command (list #$(mumi-rsync-and-index config))) |
| 2489 | #:log-file #$%mumi-rsync-and-index-log | 2491 | #:log-file #$%mumi-rsync-and-index-log |
| 2490 | #:max-duration (* 2 60 60) | 2492 | #:max-duration (* 2 60 60) |
