[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/09: services: prosody: Allow to add raw content to the config file.
From: |
Clément Lassieur |
Subject: |
07/09: services: prosody: Allow to add raw content to the config file. |
Date: |
Sun, 26 Nov 2017 09:36:09 -0500 (EST) |
snape pushed a commit to branch master
in repository guix.
commit 274b9500d1d204a06a610da304a61d5b27bcce3e
Author: Clément Lassieur <address@hidden>
Date: Fri Oct 27 22:12:41 2017 +0200
services: prosody: Allow to add raw content to the config file.
* doc/guix.texi (Messaging Services): Update accordingly.
* gnu/services/messaging.scm (prosody-configuration)[raw-content]: New
field.
(raw-content?, serialize-raw-content): New procedures.
---
doc/guix.texi | 10 +++++++---
gnu/services/messaging.scm | 13 ++++++++++++-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 627a549..51fc40d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14170,7 +14170,7 @@ See
@url{http://prosody.im/doc/configure#virtual_host_settings}.
Available @code{virtualhost-configuration} fields are:
-all these @code{prosody-configuration} fields: @code{admins},
@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled},
@code{groups-file}, @code{allow-registration?}, @code{ssl},
@code{c2s-require-encryption?}, @code{s2s-require-encryption?},
@code{s2s-secure-auth?}, @code{s2s-insecure-domains},
@code{s2s-secure-domains}, @code{authentication}, @code{log},
@code{http-max-content-size}, @code{http-external-url}, plus:
+all these @code{prosody-configuration} fields: @code{admins},
@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled},
@code{groups-file}, @code{allow-registration?}, @code{ssl},
@code{c2s-require-encryption?}, @code{s2s-require-encryption?},
@code{s2s-secure-auth?}, @code{s2s-insecure-domains},
@code{s2s-secure-domains}, @code{authentication}, @code{log},
@code{http-max-content-size}, @code{http-external-url}, @code{raw-content},
plus:
@deftypevr address@hidden parameter} string domain
Domain you wish Prosody to serve.
@end deftypevr
@@ -14192,7 +14192,7 @@ Defaults to @samp{()}.
Available @code{int-component-configuration} fields are:
-all these @code{prosody-configuration} fields: @code{admins},
@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled},
@code{groups-file}, @code{allow-registration?}, @code{ssl},
@code{c2s-require-encryption?}, @code{s2s-require-encryption?},
@code{s2s-secure-auth?}, @code{s2s-insecure-domains},
@code{s2s-secure-domains}, @code{authentication}, @code{log},
@code{http-max-content-size}, @code{http-external-url}, plus:
+all these @code{prosody-configuration} fields: @code{admins},
@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled},
@code{groups-file}, @code{allow-registration?}, @code{ssl},
@code{c2s-require-encryption?}, @code{s2s-require-encryption?},
@code{s2s-secure-auth?}, @code{s2s-insecure-domains},
@code{s2s-secure-domains}, @code{authentication}, @code{log},
@code{http-max-content-size}, @code{http-external-url}, @code{raw-content},
plus:
@deftypevr address@hidden parameter} string hostname
Hostname of the component.
@end deftypevr
@@ -14245,7 +14245,7 @@ Defaults to @samp{()}.
Available @code{ext-component-configuration} fields are:
-all these @code{prosody-configuration} fields: @code{admins},
@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled},
@code{groups-file}, @code{allow-registration?}, @code{ssl},
@code{c2s-require-encryption?}, @code{s2s-require-encryption?},
@code{s2s-secure-auth?}, @code{s2s-insecure-domains},
@code{s2s-secure-domains}, @code{authentication}, @code{log},
@code{http-max-content-size}, @code{http-external-url}, plus:
+all these @code{prosody-configuration} fields: @code{admins},
@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled},
@code{groups-file}, @code{allow-registration?}, @code{ssl},
@code{c2s-require-encryption?}, @code{s2s-require-encryption?},
@code{s2s-secure-auth?}, @code{s2s-insecure-domains},
@code{s2s-secure-domains}, @code{authentication}, @code{log},
@code{http-max-content-size}, @code{http-external-url}, @code{raw-content},
plus:
@deftypevr address@hidden parameter} string component-secret
Password which the component will use to log in.
@end deftypevr
@@ -14265,6 +14265,10 @@ Interface Prosody listens on for component connections.
Defaults to @samp{"127.0.0.1"}.
@end deftypevr
address@hidden address@hidden parameter} maybe-raw-content raw-content
+Raw content that will be added to the configuration file.
address@hidden deftypevr
+
It could be that you just want to get a @code{prosody.cfg.lua}
up and running. In that case, you can pass an
@code{opaque-prosody-configuration} record as the value of
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index f348ca1..b66d6dd 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -176,6 +176,12 @@
(serialize-string-list field-name val))
(define-maybe file-name)
+(define (raw-content? val)
+ (not (eq? val 'disabled)))
+(define (serialize-raw-content field-name val)
+ (format #t "~a" val))
+(define-maybe raw-content)
+
(define-configuration mod-muc-configuration
(name
(string "Prosody Chatrooms")
@@ -533,7 +539,12 @@ See also @url{http://prosody.im/doc/modules/mod_muc}."
(hostname
(string (configuration-missing-field 'ext-component 'hostname))
"Hostname of the component."
- ext-component)))
+ ext-component)
+
+ (raw-content
+ (maybe-raw-content 'disabled)
+ "Raw content that will be added to the configuration file."
+ common)))
;; Serialize Virtualhost line first.
(define (serialize-virtualhost-configuration config)
- branch master updated (b8e7781 -> 5c22f37), Clément Lassieur, 2017/11/26
- 03/09: gnu: prosody: Add lua5.1-bitop to inputs., Clément Lassieur, 2017/11/26
- 01/09: gnu: prosody: Update to 0.10.0., Clément Lassieur, 2017/11/26
- 09/09: tests: messaging: Enable Prosody DIGEST-MD5 auth mechanism., Clément Lassieur, 2017/11/26
- 07/09: services: prosody: Allow to add raw content to the config file.,
Clément Lassieur <=
- 02/09: gnu: Add lua5.1-bitop., Clément Lassieur, 2017/11/26
- 04/09: services: prosody: Adapt to Prosody 0.10.0., Clément Lassieur, 2017/11/26
- 05/09: services: prosody: Add support for http-external-url., Clément Lassieur, 2017/11/26
- 06/09: services: prosody: Add support for http-max-content-size., Clément Lassieur, 2017/11/26
- 08/09: services: prosody: Add support for disable-sasl-mechanisms., Clément Lassieur, 2017/11/26