aboutsummaryrefslogtreecommitdiff
path: root/modules/private/ejabberd/default.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-25 11:57:48 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-03 16:25:07 +0200
commit5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch)
tree6ed072da7b1f17ac3994ffea052aa0c0822f8446 /modules/private/ejabberd/default.nix
parent441da8aac378f401625e82caf281fa0e26128310 (diff)
downloadNix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz
Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst
Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip
Upgrade nixos
Diffstat (limited to 'modules/private/ejabberd/default.nix')
-rw-r--r--modules/private/ejabberd/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/private/ejabberd/default.nix b/modules/private/ejabberd/default.nix
index 3537c24..382b42d 100644
--- a/modules/private/ejabberd/default.nix
+++ b/modules/private/ejabberd/default.nix
@@ -14,7 +14,7 @@ in
14 }; 14 };
15 15
16 config = lib.mkIf cfg.enable { 16 config = lib.mkIf cfg.enable {
17 security.acme2.certs = { 17 security.acme.certs = {
18 "ejabberd" = config.myServices.certificates.certConfig // { 18 "ejabberd" = config.myServices.certificates.certConfig // {
19 user = "ejabberd"; 19 user = "ejabberd";
20 group = "ejabberd"; 20 group = "ejabberd";
@@ -58,7 +58,7 @@ in
58 text = '' 58 text = ''
59 host_config: 59 host_config:
60 "immae.fr": 60 "immae.fr":
61 domain_certfile: "${config.security.acme2.certs.ejabberd.directory}/full.pem" 61 domain_certfile: "${config.security.acme.certs.ejabberd.directory}/full.pem"
62 auth_method: [ldap] 62 auth_method: [ldap]
63 ldap_servers: ["${config.myEnv.jabber.ldap.host}"] 63 ldap_servers: ["${config.myEnv.jabber.ldap.host}"]
64 ldap_encrypt: tls 64 ldap_encrypt: tls
@@ -66,8 +66,8 @@ in
66 ldap_password: "${config.myEnv.jabber.ldap.password}" 66 ldap_password: "${config.myEnv.jabber.ldap.password}"
67 ldap_base: "${config.myEnv.jabber.ldap.base}" 67 ldap_base: "${config.myEnv.jabber.ldap.base}"
68 ldap_uids: 68 ldap_uids:
69 - "uid": "%u" 69 uid: "%u"
70 - "immaeXmppUid": "%u" 70 immaeXmppUid: "%u"
71 ldap_filter: "${config.myEnv.jabber.ldap.filter}" 71 ldap_filter: "${config.myEnv.jabber.ldap.filter}"
72 ''; 72 '';
73 } 73 }
@@ -81,7 +81,7 @@ in
81 ERLANG_NODE=ejabberd@localhost 81 ERLANG_NODE=ejabberd@localhost
82 ''; 82 '';
83 configFile = pkgs.runCommand "ejabberd.yml" { 83 configFile = pkgs.runCommand "ejabberd.yml" {
84 certificatePrivateKeyAndFullChain = "${config.security.acme2.certs.ejabberd.directory}/full.pem"; 84 certificatePrivateKeyAndFullChain = "${config.security.acme.certs.ejabberd.directory}/full.pem";
85 certificateCA = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; 85 certificateCA = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
86 sql_config_file = config.secrets.fullPaths."ejabberd/psql.yml"; 86 sql_config_file = config.secrets.fullPaths."ejabberd/psql.yml";
87 host_config_file = config.secrets.fullPaths."ejabberd/host.yml"; 87 host_config_file = config.secrets.fullPaths."ejabberd/host.yml";