From 4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 16 Oct 2021 17:40:07 +0200 Subject: Use attrs for secrets instead of lists --- modules/private/websites/florian/app.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'modules/private/websites/florian') diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix index 14358d8..87e622a 100644 --- a/modules/private/websites/florian/app.nix +++ b/modules/private/websites/florian/app.nix @@ -46,18 +46,16 @@ in { phpPackage = pkgs.php72; }; - secrets.keys = [ - { - dest = "websites/florian/app_passwords"; + secrets.keys = { + "websites/florian/app_passwords" = { user = config.services.httpd.Inte.user; group = config.services.httpd.Inte.group; permissions = "0400"; text = '' invite:${secrets.invite_passwords} ''; - } - { - dest = "websites/florian/app"; + }; + "websites/florian/app" = { user = config.services.httpd.Inte.user; group = config.services.httpd.Inte.group; permissions = "0400"; @@ -75,8 +73,8 @@ in { mailer_password: null secret: ${secrets.secret} ''; - } - ]; + }; + }; services.websites.env.integration.modules = adminer.apache.modules; services.websites.env.integration.vhostConfs.florian_app = { -- cgit v1.2.3