diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-16 17:40:07 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-16 20:20:45 +0200 |
commit | 4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0 (patch) | |
tree | 9a7ede9ac3f1899074e9ef568a447f883191d3b5 /modules/private/websites/florian | |
parent | da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2 (diff) | |
download | Nix-4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0.tar.gz Nix-4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0.tar.zst Nix-4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0.zip |
Use attrs for secrets instead of lists
Diffstat (limited to 'modules/private/websites/florian')
-rw-r--r-- | modules/private/websites/florian/app.nix | 14 |
1 files changed, 6 insertions, 8 deletions
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 { | |||
46 | phpPackage = pkgs.php72; | 46 | phpPackage = pkgs.php72; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | secrets.keys = [ | 49 | secrets.keys = { |
50 | { | 50 | "websites/florian/app_passwords" = { |
51 | dest = "websites/florian/app_passwords"; | ||
52 | user = config.services.httpd.Inte.user; | 51 | user = config.services.httpd.Inte.user; |
53 | group = config.services.httpd.Inte.group; | 52 | group = config.services.httpd.Inte.group; |
54 | permissions = "0400"; | 53 | permissions = "0400"; |
55 | text = '' | 54 | text = '' |
56 | invite:${secrets.invite_passwords} | 55 | invite:${secrets.invite_passwords} |
57 | ''; | 56 | ''; |
58 | } | 57 | }; |
59 | { | 58 | "websites/florian/app" = { |
60 | dest = "websites/florian/app"; | ||
61 | user = config.services.httpd.Inte.user; | 59 | user = config.services.httpd.Inte.user; |
62 | group = config.services.httpd.Inte.group; | 60 | group = config.services.httpd.Inte.group; |
63 | permissions = "0400"; | 61 | permissions = "0400"; |
@@ -75,8 +73,8 @@ in { | |||
75 | mailer_password: null | 73 | mailer_password: null |
76 | secret: ${secrets.secret} | 74 | secret: ${secrets.secret} |
77 | ''; | 75 | ''; |
78 | } | 76 | }; |
79 | ]; | 77 | }; |
80 | 78 | ||
81 | services.websites.env.integration.modules = adminer.apache.modules; | 79 | services.websites.env.integration.modules = adminer.apache.modules; |
82 | services.websites.env.integration.vhostConfs.florian_app = { | 80 | services.websites.env.integration.vhostConfs.florian_app = { |