HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
services: Add gmnisrv web service.
[jackhill/guix/guix.git]
/
gnu
/
services
/
messaging.scm
diff --git
a/gnu/services/messaging.scm
b/gnu/services/messaging.scm
index
92f86a1
..
8f2f391
100644
(file)
--- a/
gnu/services/messaging.scm
+++ b/
gnu/services/messaging.scm
@@
-1,7
+1,7
@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; GNU Guix --- Functional package management for GNU
;;; 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 © 2015, 2017, 2018
, 2019, 2020
Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;;
;;; This file is part of GNU Guix.
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;;
;;; This file is part of GNU Guix.
@@
-32,6
+32,7
@@
#:use-module (guix modules)
#:use-module (guix records)
#:use-module (guix packages)
#:use-module (guix modules)
#:use-module (guix records)
#:use-module (guix packages)
+ #:use-module (guix deprecation)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-35)
#:use-module (ice-9 match)
@@
-460,7
+461,7
@@
about using the hashed backend. See also
(log
(maybe-string "*syslog")
"Set logging options. Advanced logging configuration is not yet supported
(log
(maybe-string "*syslog")
"Set logging options. Advanced logging configuration is not yet supported
-by the
GuixSD Prosody S
ervice. See @url{https://prosody.im/doc/logging}."
+by the
Prosody s
ervice. See @url{https://prosody.im/doc/logging}."
common)
(pidfile
common)
(pidfile
@@
-812,14
+813,15
@@
string, you could instantiate a prosody service like this:
(match-lambda
(($ <bitlbee-configuration> bitlbee interface port
plugins extra-settings)
(match-lambda
(($ <bitlbee-configuration> bitlbee interface port
plugins extra-settings)
- (let ((conf (mixed-text-file "bitlbee.conf"
+ (let* ((plugins (directory-union "bitlbee-plugins" plugins))
+ (conf (mixed-text-file "bitlbee.conf"
"
[settings]
User = bitlbee
ConfigDir = /var/lib/bitlbee
DaemonInterface = " interface "
DaemonPort = " (number->string port) "
"
[settings]
User = bitlbee
ConfigDir = /var/lib/bitlbee
DaemonInterface = " interface "
DaemonPort = " (number->string port) "
- PluginDir = "
(directory-union "bitlbee-plugins" plugins)
"/lib/bitlbee
+ PluginDir = "
plugins
"/lib/bitlbee
" extra-settings)))
(with-imported-modules (source-module-closure
" extra-settings)))
(with-imported-modules (source-module-closure
@@
-839,6
+841,11
@@
string, you could instantiate a prosody service like this:
(list #$(file-append bitlbee "/sbin/bitlbee")
"-n" "-F" "-u" "bitlbee" "-c" #$conf)
(list #$(file-append bitlbee "/sbin/bitlbee")
"-n" "-F" "-u" "bitlbee" "-c" #$conf)
+ ;; Allow 'bitlbee-purple' to use libpurple plugins.
+ #:environment-variables
+ (list (string-append "PURPLE_PLUGIN_PATH="
+ #$plugins "/lib/purple-2"))
+
#:pid-file "/var/run/bitlbee.pid"
#:mappings (list (file-system-mapping
(source "/var/lib/bitlbee")
#:pid-file "/var/run/bitlbee.pid"
#:mappings (list (file-system-mapping
(source "/var/lib/bitlbee")
@@
-882,9
+889,10
@@
string, you could instantiate a prosody service like this:
"Run @url{http://bitlbee.org,BitlBee}, a daemon that acts as
a gateway between IRC and chat networks.")))
"Run @url{http://bitlbee.org,BitlBee}, a daemon that acts as
a gateway between IRC and chat networks.")))
-(define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated
- (interface "127.0.0.1") (port 6667)
- (extra-settings ""))
+(define-deprecated (bitlbee-service #:key (bitlbee bitlbee)
+ (interface "127.0.0.1") (port 6667)
+ (extra-settings ""))
+ bitlbee-service-type
"Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that
acts as a gateway between IRC and chat networks.
"Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that
acts as a gateway between IRC and chat networks.