branch: main
commit bfb7779bdfcca033477ee1d5521a109d9be0eee1
Author: Romain GARBAGE <[email protected]>
AuthorDate: Fri Mar 21 11:48:28 2025 +0100
cuirass: Change default value for %cuirass-url.
* src/cuirass/parameters.scm (%cuirass-url): Change default value.
* src/cuirass/notification.scm (build-details-url): Update according to
change.
* src/cuirass/rss.scm (build-details-url), (rss-feed): Update according to
change.
* doc/cuirass.texi (Parameters): Update documentation.
Signed-off-by: Ludovic Courtès <[email protected]>
---
doc/cuirass.texi | 2 +-
src/cuirass/notification.scm | 2 +-
src/cuirass/parameters.scm | 2 +-
src/cuirass/rss.scm | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/doc/cuirass.texi b/doc/cuirass.texi
index 61e2184..f832c76 100644
--- a/doc/cuirass.texi
+++ b/doc/cuirass.texi
@@ -370,7 +370,7 @@ The Cuirass PostgreSQL database name.
@item @code{%cuirass-host} (default: @code{"/var/run/postgresql"})
The Cuirass PostgreSQL database host.
-@item @code{%cuirass-url} (default: @code{#f})
+@item @code{%cuirass-url} (default: @code{""})
The URL of the Cuirass web server. This is useful to send absolute
links within notifications.
diff --git a/src/cuirass/notification.scm b/src/cuirass/notification.scm
index 4c2e261..c151bd8 100644
--- a/src/cuirass/notification.scm
+++ b/src/cuirass/notification.scm
@@ -105,7 +105,7 @@
(define (build-details-url build)
"Return the build details URL for BUILD."
(let ((id (build-id build))
- (url (or (%cuirass-url) "")))
+ (url (%cuirass-url)))
(string-append url "/build/" (number->string id) "/details")))
(define (notification-subject build)
diff --git a/src/cuirass/parameters.scm b/src/cuirass/parameters.scm
index f71d5bc..0a5fe21 100644
--- a/src/cuirass/parameters.scm
+++ b/src/cuirass/parameters.scm
@@ -45,7 +45,7 @@
;; The URL of the Cuirass web server. This is useful to send absolute links
;; within notifications.
(define %cuirass-url
- (make-parameter #f))
+ (make-parameter ""))
;; The URL of the Zabbix monitoring server providing the workers status,
;; if supported.
diff --git a/src/cuirass/rss.scm b/src/cuirass/rss.scm
index a4c1f4e..b44c41b 100644
--- a/src/cuirass/rss.scm
+++ b/src/cuirass/rss.scm
@@ -131,7 +131,7 @@ list ATTRS and the child nodes in BODY."
(define (build-details-url build)
"Return the build details URL for BUILD."
(let ((id (build-id build))
- (url (or (%cuirass-url) "")))
+ (url (%cuirass-url)))
(string-append url "/build/" (number->string id) "/details")))
(define* (build->rss-item build)
@@ -168,8 +168,9 @@ You can find the detailed information about this build "
(define* (rss-feed builds #:key params)
(let* ((specification (and params
(assq-ref params 'specification)))
- (cuirass-url (or (%cuirass-url)
- "https://cuirass.org";))
+ (cuirass-url (if (string-null? (%cuirass-url))
+ "https://cuirass.org";
+ (%cuirass-url)))
(url (format #f "~a/events/rss/~a"
cuirass-url
(if specification
