diff options
| -rw-r--r-- | doc/guix.texi | 8 | ||||
| -rw-r--r-- | gnu/services/telephony.scm | 8 | ||||
| -rw-r--r-- | gnu/tests/telephony.scm | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 876172fa3a..bc289bad7b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -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) diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index 7c83f13b2a..e678bae87c 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -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 diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm index 998bdbccf9..bc464a431a 100644 --- a/gnu/tests/telephony.scm +++ b/gnu/tests/telephony.scm @@ -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" |