me/guix
Archived
1
0
Fork 0
Code Activity

services: cuirass: Add parameters support.

Browse source 
* gnu/services/cuirass.scm (<cuirass-configuration>)[parameters]: New field.
[zabbix-uri]: Remove it.
(cuirass-shepherd-service): Honor it.
This commit is contained in:
Mathieu Othacehe 2021-02-22 09:26:06 +01:00
parent 61a5305b39
commit 1443e2dd98
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/services/cuirass.scm
View file

@ -108,6 +108,8 @@
(default "cuirass")) (default "cuirass"))
(interval cuirass-configuration-interval ;integer (seconds) (interval cuirass-configuration-interval ;integer (seconds)
(default 60)) (default 60))
(parameters cuirass-configuration-parameters ;string
(default #f))
(remote-server cuirass-configuration-remote-server (remote-server cuirass-configuration-remote-server
(default #f)) (default #f))
(database cuirass-configuration-database ;string (database cuirass-configuration-database ;string
@ -124,8 +126,6 @@
(default #f)) (default #f))
(fallback? cuirass-configuration-fallback? ;boolean (fallback? cuirass-configuration-fallback? ;boolean
(default #f)) (default #f))
(zabbix-uri cuirass-configuration-zabbix-uri ;string
(default #f))
(extra-options cuirass-configuration-extra-options (extra-options cuirass-configuration-extra-options
(default '()))) (default '())))
@ -138,6 +138,7 @@
(user (cuirass-configuration-user config)) (user (cuirass-configuration-user config))
(group (cuirass-configuration-group config)) (group (cuirass-configuration-group config))
(interval (cuirass-configuration-interval config)) (interval (cuirass-configuration-interval config))
(parameters (cuirass-configuration-parameters config))
(remote-server (cuirass-configuration-remote-server config)) (remote-server (cuirass-configuration-remote-server config))
(database (cuirass-configuration-database config)) (database (cuirass-configuration-database config))
(port (cuirass-configuration-port config)) (port (cuirass-configuration-port config))
@ -146,7 +147,6 @@
(use-substitutes? (cuirass-configuration-use-substitutes? config)) (use-substitutes? (cuirass-configuration-use-substitutes? config))
(one-shot? (cuirass-configuration-one-shot? config)) (one-shot? (cuirass-configuration-one-shot? config))
(fallback? (cuirass-configuration-fallback? config)) (fallback? (cuirass-configuration-fallback? config))
(zabbix-uri (cuirass-configuration-zabbix-uri config))
(extra-options (cuirass-configuration-extra-options config))) (extra-options (cuirass-configuration-extra-options config)))
`(,(shepherd-service `(,(shepherd-service
(documentation "Run Cuirass.") (documentation "Run Cuirass.")
@ -159,6 +159,11 @@
#$(scheme-file "cuirass-specs.scm" specs) #$(scheme-file "cuirass-specs.scm" specs)
"--database" #$database "--database" #$database
"--interval" #$(number->string interval) "--interval" #$(number->string interval)
#$@(if parameters
(list (string-append
"--parameters="
parameters))
'())
#$@(if remote-server '("--build-remote") '()) #$@(if remote-server '("--build-remote") '())
#$@(if use-substitutes? '("--use-substitutes") '()) #$@(if use-substitutes? '("--use-substitutes") '())
#$@(if one-shot? '("--one-shot") '()) #$@(if one-shot? '("--one-shot") '())
@ -186,13 +191,13 @@
"--port" #$(number->string port) "--port" #$(number->string port)
"--listen" #$host "--listen" #$host
"--interval" #$(number->string interval) "--interval" #$(number->string interval)
#$@(if parameters
(list (string-append
"--parameters="
parameters))
'())
#$@(if use-substitutes? '("--use-substitutes") '()) #$@(if use-substitutes? '("--use-substitutes") '())
#$@(if fallback? '("--fallback") '()) #$@(if fallback? '("--fallback") '())
#$@(if zabbix-uri
(list (string-append
"--zabbix-uri="
zabbix-uri))
'())
#$@extra-options) #$@extra-options)
#:user #$user #:user #$user
@ -223,6 +228,11 @@
"--publish-port=" "--publish-port="
(number->string publish-port))) (number->string publish-port)))
'()) '())
#$@(if parameters
(list (string-append
"--parameters="
parameters))
'())
#$@(if trigger-url #$@(if trigger-url
(list (list
(string-append (string-append