TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

services: Adjust the jami service for the upgraded jami. 

* gnu/services/telephony.scm (jami-configuration)[jamid]: Rename libring to
libjami.
* gnu/services/telephony.scm
(jami-configuration->command-line-arguments): Adjust daemon file name.
* gnu/services/telephony.scm (jami-service-type): Adjust doc.
* gnu/tests/telephony.scm (run-jami-test): Check for 'jamid' process, not
'dring'.
* doc/guix.texi (Telephony Services): Adjust doc for the jami-qt to jami and
libring to libjami packages renaming.
This commit is contained in:
Maxim Cournoyer 2022-01-12 23:13:35 -05:00
parent 1ed66d1461
commit 374fea0f3b
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guix.texi
View File

@ -23849,9 +23849,9 @@ service found under @file{/var/lib/jami} are recreated every time the
service starts.
Jami accounts and their corresponding backup archives can be generated
using either the @code{jami-qt} or @code{jami-gnome} Jami clients. The
accounts should not be password-protected, but it is wise to ensure
their files are only readable by @samp{root}.
using the @code{jami} or @code{jami-gnome} Jami clients. The accounts
should not be password-protected, but it is wise to ensure their files
are only readable by @samp{root}.
The next example shows how to declare that only some contacts should be
allowed to communicate with a given account:
@ -23966,7 +23966,7 @@ The complete set of available configuration options is detailed below.
Available @code{jami-configuration} fields are:
@table @asis
@item @code{jamid} (default: @code{libring}) (type: package)
@item @code{jamid} (default: @code{libjami}) (type: package)
The Jami daemon package to use.
@item @code{dbus} (default: @code{dbus}) (type: package)

8
gnu/services/telephony.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 nee <nee-git@hidamari.blue>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -227,7 +227,7 @@ SET-ACCOUNT-DETAILS."
(define-configuration/no-serialization jami-configuration
(jamid
(file-like libring)
(file-like libjami)
"The Jami daemon package to use.")
(dbus
(file-like dbus)
@ -265,7 +265,7 @@ consistent state."))
CONFIG, a <jami-configuration> object."
(match-record config <jami-configuration>
(jamid dbus enable-logging? debug? auto-answer?)
`(,(file-append jamid "/lib/ring/dring")
`(,(file-append jamid "/libexec/jamid")
"--persistent" ;stay alive after client quits
,@(if enable-logging?
'() ;logs go to syslog by default
@ -739,7 +739,7 @@ argument, either a registered username or the fingerprint of the account.")
(const %jami-accounts))
(service-extension activation-service-type
jami-dbus-session-activation)))
(description "Run the Jami daemon (@command{dring}). This service is
(description "Run the Jami daemon (@command{jamid}). This service is
geared toward the use case of hosting Jami rendezvous points over a headless
server. If you use Jami on your local machine, you may prefer to setup a user
Shepherd service for it instead; this way, the daemon will be shared via your

4
gnu/tests/telephony.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gnu.org>.
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>.
;;;
;;; This file is part of GNU Guix.
;;;
@ -174,7 +174,7 @@ accounts provisioning feature of the service."
;; in the service; use retries.
(with-retries 20 1
(not (zero? (status:exit-val
(system* "pgrep" "dring")))))))
(system* "pgrep" "jamid")))))))
marionette))
(test-assert "service can be restarted"