diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-12 23:13:35 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-13 00:57:52 -0500 |
| commit | 374fea0f3bc8035f626cb29e6045130df9ffdaf8 (patch) | |
| tree | 751075e37c3e5edb075cd82c175863e2acb1b1d8 /gnu | |
| parent | 1ed66d1461d18c97894381bace428b982980d597 (diff) | |
| download | guix-374fea0f3bc8035f626cb29e6045130df9ffdaf8.tar.gz | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/telephony.scm | 8 | ||||
| -rw-r--r-- | gnu/tests/telephony.scm | 4 |
2 files changed, 6 insertions, 6 deletions
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" |