ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: bitlbee: Add plugins.

Browse source 
* doc/guix.texi (Bitlbee Service): Add plugins.
* gnu/services/messaging.scm (<bitlbee-configuration>): Add plugins argument.
  (bitlbee-shepherd-service): Update config file.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Pierre-Antoine Rouby 2018-05-10 16:37:58 +02:00 committed by Ludovic Courtès
parent b87fc9ab9d
commit 36d619e85d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/guix.texi
View file

@ -14985,6 +14985,9 @@ networking interface.
@item @code{package} (default: @code{bitlbee}) @item @code{package} (default: @code{bitlbee})
The BitlBee package to use. The BitlBee package to use.
@item @code{plugins} (default: @code{'()})
List of plugin packages to use---e.g., @code{bitlbee-discord}.
@item @code{extra-settings} (default: @code{""}) @item @code{extra-settings} (default: @code{""})
Configuration snippet added as-is to the BitlBee configuration file. Configuration snippet added as-is to the BitlBee configuration file.
@end table @end table

13
gnu/services/messaging.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -790,20 +791,24 @@ (define-record-type* <bitlbee-configuration>
(default "127.0.0.1")) (default "127.0.0.1"))
(port bitlbee-configuration-port (port bitlbee-configuration-port
(default 6667)) (default 6667))
(plugins bitlbee-plugins
(default '()))
(extra-settings bitlbee-configuration-extra-settings (extra-settings bitlbee-configuration-extra-settings
(default ""))) (default "")))
(define bitlbee-shepherd-service (define bitlbee-shepherd-service
(match-lambda (match-lambda
(($ <bitlbee-configuration> bitlbee interface port extra-settings) (($ <bitlbee-configuration> bitlbee interface port
(let ((conf (plain-file "bitlbee.conf" plugins extra-settings)
(string-append " (let ((conf (mixed-text-file "bitlbee.conf"
"
[settings] [settings]
User = bitlbee User = bitlbee
ConfigDir = /var/lib/bitlbee ConfigDir = /var/lib/bitlbee
DaemonInterface = " interface " DaemonInterface = " interface "
DaemonPort = " (number->string port) " DaemonPort = " (number->string port) "
" extra-settings)))) PluginDir = " (directory-union "bitlbee-plugins" plugins) "/lib/bitlbee
" extra-settings)))
(with-imported-modules (source-module-closure (with-imported-modules (source-module-closure
'((gnu build shepherd) '((gnu build shepherd)