summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-02-22 09:26:06 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-02-22 10:23:04 +0100
commit1443e2dd98ac6e2aecff726cfcc683dd9ba7240d (patch)
treecb7b723eb0e80cbc5f5524b0309c874758c4c399
parent61a5305b395368816d8c594ae82bc794449a83c8 (diff)
services: cuirass: Add parameters support.
* gnu/services/cuirass.scm (<cuirass-configuration>)[parameters]: New field. [zabbix-uri]: Remove it. (cuirass-shepherd-service): Honor it.
-rw-r--r--gnu/services/cuirass.scm26
1 files changed, 18 insertions, 8 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 99edd3d13e..7b03ec88d7 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -108,6 +108,8 @@
(default "cuirass"))
(interval cuirass-configuration-interval ;integer (seconds)
(default 60))
+ (parameters cuirass-configuration-parameters ;string
+ (default #f))
(remote-server cuirass-configuration-remote-server
(default #f))
(database cuirass-configuration-database ;string
@@ -124,8 +126,6 @@
(default #f))
(fallback? cuirass-configuration-fallback? ;boolean
(default #f))
- (zabbix-uri cuirass-configuration-zabbix-uri ;string
- (default #f))
(extra-options cuirass-configuration-extra-options
(default '())))
@@ -138,6 +138,7 @@
(user (cuirass-configuration-user config))
(group (cuirass-configuration-group config))
(interval (cuirass-configuration-interval config))
+ (parameters (cuirass-configuration-parameters config))
(remote-server (cuirass-configuration-remote-server config))
(database (cuirass-configuration-database config))
(port (cuirass-configuration-port config))
@@ -146,7 +147,6 @@
(use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config))
(fallback? (cuirass-configuration-fallback? config))
- (zabbix-uri (cuirass-configuration-zabbix-uri config))
(extra-options (cuirass-configuration-extra-options config)))
`(,(shepherd-service
(documentation "Run Cuirass.")
@@ -159,6 +159,11 @@
#$(scheme-file "cuirass-specs.scm" specs)
"--database" #$database
"--interval" #$(number->string interval)
+ #$@(if parameters
+ (list (string-append
+ "--parameters="
+ parameters))
+ '())
#$@(if remote-server '("--build-remote") '())
#$@(if use-substitutes? '("--use-substitutes") '())
#$@(if one-shot? '("--one-shot") '())
@@ -186,13 +191,13 @@
"--port" #$(number->string port)
"--listen" #$host
"--interval" #$(number->string interval)
- #$@(if use-substitutes? '("--use-substitutes") '())
- #$@(if fallback? '("--fallback") '())
- #$@(if zabbix-uri
+ #$@(if parameters
(list (string-append
- "--zabbix-uri="
- zabbix-uri))
+ "--parameters="
+ parameters))
'())
+ #$@(if use-substitutes? '("--use-substitutes") '())
+ #$@(if fallback? '("--fallback") '())
#$@extra-options)
#:user #$user
@@ -223,6 +228,11 @@
"--publish-port="
(number->string publish-port)))
'())
+ #$@(if parameters
+ (list (string-append
+ "--parameters="
+ parameters))
+ '())
#$@(if trigger-url
(list
(string-append