summary refs log tree commit diff
path: root/gnu/services
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-06-10 09:53:32 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-06-10 23:52:34 -0400
commit8649ac5eaa0447a766b18550787b60639e57a7fb (patch)
tree250f175c7500bf8060b722c4e9bc0a6eb5e8298a /gnu/services
parent8994e13b9f7bd5c444f3dcf0d5ba94f6e658771a (diff)
downloadguix-8649ac5eaa0447a766b18550787b60639e57a7fb.tar.gz
services: jami-configuration: Rename 'jamid' field to 'libjami'.
* gnu/services/telephony.scm (gnu):
(jami-configuration)[jamid]: Rename field to...
[libjami]: ... this.
(jami-configuration->command-line-arguments): Adjust accordingly.
(jami-shepherd-services): Likewise.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/telephony.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm
index 3b397054a8..0a11e283a0 100644
--- a/gnu/services/telephony.scm
+++ b/gnu/services/telephony.scm
@@ -49,7 +49,7 @@
             jami-account-name-server-uri
 
             jami-configuration
-            jami-configuration-jamid
+            jami-configuration-libjami
             jami-configuration-dbus
             jami-configuration-enable-logging?
             jami-configuration-debug?
@@ -228,7 +228,7 @@ SET-ACCOUNT-DETAILS."
 (define-maybe/no-serialization jami-account-list)
 
 (define-configuration/no-serialization jami-configuration
-  (jamid
+  (libjami
    (file-like libjami)
    "The Jami daemon package to use.")
   (dbus
@@ -266,8 +266,8 @@ consistent state."))
   "Derive the command line arguments to used to launch the Jami daemon from
 CONFIG, a <jami-configuration> object."
   (match-record config <jami-configuration>
-    (jamid dbus enable-logging? debug? auto-answer?)
-    `(,(file-append jamid "/libexec/jamid")
+    (libjami dbus enable-logging? debug? auto-answer?)
+    `(,(file-append libjami "/libexec/jamid")
       "--persistent"                    ;stay alive after client quits
       ,@(if enable-logging?
             '()                         ;logs go to syslog by default
@@ -302,7 +302,7 @@ CONFIG, a <jami-configuration> object."
 
 (define (jami-shepherd-services config)
   "Return a <shepherd-service> running the Jami daemon."
-  (let* ((jamid (jami-configuration-jamid config))
+  (let* ((libjami (jami-configuration-libjami config))
          (nss-certs (jami-configuration-nss-certs config))
          (dbus (jami-configuration-dbus config))
          (dbus-daemon (file-append dbus "/bin/dbus-daemon"))
@@ -524,7 +524,7 @@ argument, either a registered username or the fingerprint of the account.")
                    #:environment-variables
                    ;; This is so that the cx.ring.Ring service D-Bus
                    ;; definition is found by dbus-daemon.
-                   (list (string-append "XDG_DATA_DIRS=" #$jamid "/share"))))
+                   (list (string-append "XDG_DATA_DIRS=" #$libjami "/share"))))
                (stop #~(make-kill-destructor)))
 
               (shepherd-service