ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: Adjust the jami service for the upgraded jami.

Browse source 
* 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. service starts.
Jami accounts and their corresponding backup archives can be generated Jami accounts and their corresponding backup archives can be generated
using either the @code{jami-qt} or @code{jami-gnome} Jami clients. The using the @code{jami} or @code{jami-gnome} Jami clients. The accounts
accounts should not be password-protected, but it is wise to ensure should not be password-protected, but it is wise to ensure their files
their files are only readable by @samp{root}. are only readable by @samp{root}.
The next example shows how to declare that only some contacts should be The next example shows how to declare that only some contacts should be
allowed to communicate with a given account: 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: Available @code{jami-configuration} fields are:
@table @asis @table @asis
@item @code{jamid} (default: @code{libring}) (type: package) @item @code{jamid} (default: @code{libjami}) (type: package)
The Jami daemon package to use. The Jami daemon package to use.
@item @code{dbus} (default: @code{dbus}) (type: package) @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 ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 nee <nee-git@hidamari.blue> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -227,7 +227,7 @@ (define-maybe/no-serialization jami-account-list)
(define-configuration/no-serialization jami-configuration (define-configuration/no-serialization jami-configuration
(jamid (jamid
(file-like libring) (file-like libjami)
"The Jami daemon package to use.") "The Jami daemon package to use.")
(dbus (dbus
(file-like dbus) (file-like dbus)
@ -265,7 +265,7 @@ (define (jami-configuration->command-line-arguments config)
CONFIG, a <jami-configuration> object." CONFIG, a <jami-configuration> object."
(match-record config <jami-configuration> (match-record config <jami-configuration>
(jamid dbus enable-logging? debug? auto-answer?) (jamid dbus enable-logging? debug? auto-answer?)
`(,(file-append jamid "/lib/ring/dring") `(,(file-append jamid "/libexec/jamid")
"--persistent" ;stay alive after client quits "--persistent" ;stay alive after client quits
,@(if enable-logging? ,@(if enable-logging?
'() ;logs go to syslog by default '() ;logs go to syslog by default
@ -739,7 +739,7 @@ (define jami-service-type
(const %jami-accounts)) (const %jami-accounts))
(service-extension activation-service-type (service-extension activation-service-type
jami-dbus-session-activation))) 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 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 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 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 ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -174,7 +174,7 @@ (define marionette
;; in the service; use retries. ;; in the service; use retries.
(with-retries 20 1 (with-retries 20 1
(not (zero? (status:exit-val (not (zero? (status:exit-val
(system* "pgrep" "dring"))))))) (system* "pgrep" "jamid")))))))
marionette)) marionette))
(test-assert "service can be restarted" (test-assert "service can be restarted"