diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-01-15 20:41:19 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-01-15 20:41:19 +0100 |
commit | 981fa80354fd6f00f49446777c38f77bd8a65f65 (patch) | |
tree | 878a24e3daa325cfec75b1a413e5144829558d38 /modules/private/ejabberd/default.nix | |
parent | 258441019881c451686dbe537069228cc8e49612 (diff) | |
download | Nix-981fa80354fd6f00f49446777c38f77bd8a65f65.tar.gz Nix-981fa80354fd6f00f49446777c38f77bd8a65f65.tar.zst Nix-981fa80354fd6f00f49446777c38f77bd8a65f65.zip |
Upgrade acme bot
Diffstat (limited to 'modules/private/ejabberd/default.nix')
-rw-r--r-- | modules/private/ejabberd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/private/ejabberd/default.nix b/modules/private/ejabberd/default.nix index 5e717f4..3537c24 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.acme.certs = { | 17 | security.acme2.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.acme.directory}/ejabberd/full.pem" | 61 | domain_certfile: "${config.security.acme2.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 |
@@ -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.acme.directory}/ejabberd/full.pem"; | 84 | certificatePrivateKeyAndFullChain = "${config.security.acme2.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"; |