From: Pierre-Antoine Rouby <contact@parouby.fr>
To: ludo@gnu.org
Cc: 31331@debbugs.gnu.org, Pierre-Antoine Rouby <contact@parouby.fr>
Subject: [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins.
Date: Thu, 10 May 2018 16:29:23 +0200 [thread overview]
Message-ID: <20180510142923.4132-1-contact@parouby.fr> (raw)
In-Reply-To: <87in7zajku.fsf@gnu.org>
* gnu/services/messaging.scm (<bitlbee-configuration>): 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 <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;;
;;; 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-configuration> bitlbee interface port extra-settings)
- (let ((conf (plain-file "bitlbee.conf"
- (string-append "
+ (($ <bitlbee-configuration> 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
next prev parent reply other threads:[~2018-05-10 14:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-01 12:05 [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord Pierre-Antoine Rouby
2018-05-01 17:38 ` [bug#31331] [PATCH 2/2] gnu: services: bitlbee: Add plugins Pierre-Antoine Rouby
2018-05-07 9:41 ` Ludovic Courtès
2018-05-10 14:29 ` Pierre-Antoine Rouby [this message]
2018-05-10 14:37 ` Pierre-Antoine Rouby
2018-05-10 20:29 ` bug#31331: " Ludovic Courtès
2018-05-02 18:41 ` [bug#31331] [PATCH 1/2] gnu: Add bitlbee-discord Nils Gillmann
2018-05-02 20:21 ` parouby
2018-05-02 20:30 ` Nils Gillmann
2018-05-05 15:57 ` Pierre-Antoine Rouby
2018-05-07 9:49 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180510142923.4132-1-contact@parouby.fr \
--to=contact@parouby.fr \
--cc=31331@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).