diff options
| author | Clément Lassieur <clement@lassieur.org> | 2017-10-06 02:01:07 +0200 |
|---|---|---|
| committer | Clément Lassieur <clement@lassieur.org> | 2017-11-26 15:30:56 +0100 |
| commit | 5cc6dcd734fbf40371aaa6b2ebb825fb35397209 (patch) | |
| tree | dd6cb6cb060ba62d03971521d95c22c1bc7f2327 /gnu | |
| parent | 3ba501083d724b4a86bf27c93e0d7b4db3e6c04b (diff) | |
| download | patches-5cc6dcd734fbf40371aaa6b2ebb825fb35397209.tar patches-5cc6dcd734fbf40371aaa6b2ebb825fb35397209.tar.gz | |
services: prosody: Adapt to Prosody 0.10.0.
* doc/guix.texi (Messaging Services): Add "mam" as a module example. Document
'prosodyctl check'. Replace 'prosodyctl cert request' with 'prosodyctl cert
import'. Regenerate it.
* gnu/services/messaging.scm (serialize-module-list): Remove "posix" from the
default modules list because it is now automatically loaded.
(ssl-configuration)[key, certificate]: Remove them because they are now
automatically located. Fix their docstrings.
(%default-modules-enabled): Add "carbons" and "blocklist".
(prosody-configuration)[certificates]: Set default directory from which
certificates/keys will be automatically located.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/messaging.scm | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 715d6181f5..526ad5a410 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -160,7 +160,7 @@ (define (module-list? val) (string-list? val)) (define (serialize-module-list field-name val) - (serialize-string-list field-name (cons "posix" val))) + (serialize-string-list field-name val)) (define-maybe module-list) (define (file-name? val) @@ -203,12 +203,12 @@ just joined the room.")) "This determines what handshake to use.") (key - (file-name "/etc/prosody/certs/key.pem") - "Path to your private key file, relative to @code{/etc/prosody}.") + (maybe-file-name 'disabled) + "Path to your private key file.") (certificate - (file-name "/etc/prosody/certs/cert.pem") - "Path to your certificate file, relative to @code{/etc/prosody}.") + (maybe-file-name 'disabled) + "Path to your certificate file.") (capath (file-name "/etc/ssl/certs") @@ -271,7 +271,9 @@ can create such a file with: "tls" "dialback" "disco" + "carbons" "private" + "blocklist" "vcard" "version" "uptime" @@ -321,6 +323,13 @@ can create such a file with: paths in order. See @url{http://prosody.im/doc/plugins_directory}." global) + (certificates + (file-name "/etc/prosody/certs") + "Every virtual host and component needs a certificate so that clients and +servers can securely verify its identity. Prosody will automatically load +certificates/keys from the directory specified here." + global) + (admins (string-list '()) "This is a list of accounts that are admins for the server. Note that you |