summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-10-08 23:39:00 +0200
committertv <tv@krebsco.de>2022-10-08 23:39:13 +0200
commit2dbfd35f759702b53938b5ca4f1cd9a2fb731317 (patch)
tree69c9b3f1dd765a40c5b4fdbfdfea30f480e6412f
parent8d6727eaae2486e19a461b78667baa05191b6b1c (diff)
tv ejabberd: JSON > YAML
-rw-r--r--tv/3modules/ejabberd/default.nix31
1 files changed, 3 insertions, 28 deletions
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index ce736f43c..edc5296b0 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/3modules/ejabberd/default.nix
@@ -12,7 +12,7 @@
fi
'';
- settingsFormat = pkgs.formats.yaml {};
+ settingsFormat = pkgs.formats.json {};
in {
options.tv.ejabberd = {
@@ -25,32 +25,7 @@ in {
};
configFile = mkOption {
type = types.either types.package types.absolute-pathname;
- default =
- (settingsFormat.generate "ejabberd.yaml" cfg.settings)
- # XXX ejabberd cannot parse MQTT topic filters enclosed in single
- # quotes. By changing the YAML formatting style, double quotes will
- # be used instead.
- #
- # Related error message:
- # Invalid value of option modules->mod_mqtt->access_publish:
- # Malformed topic filter
- #
- .overrideAttrs (old: {
- nativeBuildInputs =
- filter
- (pkg: (parseDrvName pkg.name).name != "remarshal")
- old.nativeBuildInputs
- ++
- singleton (pkgs.symlinkJoin {
- name = "remarshal";
- paths = [
- (pkgs.writeDashBin "json2yaml" ''
- exec ${pkgs.remarshal}/bin/json2yaml --yaml-style \> "$@"
- '')
- pkgs.remarshal
- ];
- });
- });
+ default = settingsFormat.generate "ejabberd.yaml" cfg.settings;
};
ciphers = mkOption {
type = types.listOf types.str;
@@ -72,7 +47,7 @@ in {
readOnly = true;
default =
imap
- (i: const /* yaml */ "/tmp/credentials/certfile${toJSON i}")
+ (i: const "/tmp/credentials/certfile${toJSON i}")
cfg.certfiles;
};
hosts = mkOption {