Use attrs for secrets instead of lists

[perso/Immae/Config/Nix.git] / modules / private / ejabberd / default.nix

diff --git a/modules/private/ejabberd/default.nix b/modules/private/ejabberd/default.nix
index 382b42dd8ae755e740661344d3987bd575c689e7..4d86a648ada0d460d4e56670d1bd8ef3aaac3904 100644 (file)
--- a/modules/private/ejabberd/default.nix
+++ b/modules/private/ejabberd/default.nix
@@ -19,6 +19,7 @@ in
         user = "ejabberd";
         group = "ejabberd";
         domain = "eldiron.immae.eu";
+        keyType = "rsa4096";
         postRun = ''
           systemctl restart ejabberd.service
           '';
@@ -36,9 +37,8 @@ in
     systemd.services.ejabberd.postStop = ''
       rm /var/log/ejabberd/erl_crash*.dump
       '';
-    secrets.keys = [
-      {
-        dest = "ejabberd/psql.yml";
+    secrets.keys = {
+      "ejabberd/psql.yml" = {
         permissions = "0400";
         user = "ejabberd";
         group = "ejabberd";
@@ -49,9 +49,8 @@ in
           sql_username: "${config.myEnv.jabber.postgresql.user}"
           sql_password: "${config.myEnv.jabber.postgresql.password}"
           '';
-      }
-      {
-        dest = "ejabberd/host.yml";
+      };
+      "ejabberd/host.yml" = {
         permissions = "0400";
         user = "ejabberd";
         group = "ejabberd";
@@ -70,8 +69,8 @@ in
                 immaeXmppUid: "%u"
               ldap_filter: "${config.myEnv.jabber.ldap.filter}"
           '';
-      }
-    ];
+      };
+    };
     users.users.ejabberd.extraGroups = [ "keys" ];
     services.ejabberd = {
       package = pkgs.ejabberd.override { withPgsql = true; };