From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGmb4-0007qp-6Y for guix-patches@gnu.org; Thu, 10 May 2018 10:31:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGmb0-0005tD-55 for guix-patches@gnu.org; Thu, 10 May 2018 10:31:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGmb0-0005t9-1Q for guix-patches@gnu.org; Thu, 10 May 2018 10:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fGmaz-00046C-Pa for guix-patches@gnu.org; Thu, 10 May 2018 10:31:01 -0400 Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins. Resent-Message-ID: From: Pierre-Antoine Rouby Date: Thu, 10 May 2018 16:29:23 +0200 Message-Id: <20180510142923.4132-1-contact@parouby.fr> In-Reply-To: <87in7zajku.fsf@gnu.org> References: <87in7zajku.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ludo@gnu.org Cc: 31331@debbugs.gnu.org, Pierre-Antoine Rouby * gnu/services/messaging.scm (): Add plugins argument. (bitlbee-shepherd-service): Update config file. (bitlbee-service): Add plugins argument. --- doc/guix.texi | 3 +++ gnu/services/messaging.scm | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87892fc89..b939097a8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14880,6 +14880,9 @@ networking interface. @item @code{package} (default: @code{bitlbee}) The BitlBee package to use. +@item @code{plugins} (default: @code{plugins}) +The BitlBee plugins package to use. + @item @code{extra-settings} (default: @code{""}) Configuration snippet added as-is to the BitlBee configuration file. @end table diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 80ffed0f2..0db086834 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. ;;; @@ -783,20 +784,24 @@ string, you could instantiate a prosody service like this: (default "127.0.0.1")) (port bitlbee-configuration-port (default 6667)) + (plugins bitlbee-plugins + (default '())) (extra-settings bitlbee-configuration-extra-settings (default ""))) (define bitlbee-shepherd-service (match-lambda - (($ bitlbee interface port extra-settings) - (let ((conf (plain-file "bitlbee.conf" - (string-append " + (($ bitlbee interface port + plugins extra-settings) + (let ((conf (mixed-text-file "bitlbee.conf" + " [settings] User = bitlbee ConfigDir = /var/lib/bitlbee DaemonInterface = " interface " DaemonPort = " (number->string port) " -" extra-settings)))) + PluginDir = " (directory-union "bitlbee-plugins" plugins) "/lib/bitlbee +" extra-settings))) (with-imported-modules (source-module-closure '((gnu build shepherd) @@ -860,6 +865,7 @@ a gateway between IRC and chat networks."))) (define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated (interface "127.0.0.1") (port 6667) + (plugins '()) (extra-settings "")) "Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that acts as a gateway between IRC and chat networks. @@ -875,4 +881,5 @@ configuration file." (bitlbee-configuration (bitlbee bitlbee) (interface interface) (port port) + (plugins plugins) (extra-settings extra-settings)))) -- 2.17.0