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/piedsjaloux/integration.nix | |
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/piedsjaloux/integration.nix')
-rw-r--r-- | modules/private/websites/piedsjaloux/integration.nix | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix index dc98900..f501eba 100644 --- a/modules/private/websites/piedsjaloux/integration.nix +++ b/modules/private/websites/piedsjaloux/integration.nix | |||
@@ -52,32 +52,29 @@ in { | |||
52 | phpPackage = pkgs.php72; | 52 | phpPackage = pkgs.php72; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | secrets.keys = [ | 55 | secrets.keys."websites/piedsjaloux/integration" = { |
56 | { | 56 | user = config.services.httpd.Inte.user; |
57 | dest = "websites/piedsjaloux/integration"; | 57 | group = config.services.httpd.Inte.group; |
58 | user = config.services.httpd.Inte.user; | 58 | permissions = "0400"; |
59 | group = config.services.httpd.Inte.group; | 59 | text = '' |
60 | permissions = "0400"; | 60 | # This file is auto-generated during the composer install |
61 | text = '' | 61 | parameters: |
62 | # This file is auto-generated during the composer install | 62 | database_host: ${secrets.mysql.host} |
63 | parameters: | 63 | database_port: ${secrets.mysql.port} |
64 | database_host: ${secrets.mysql.host} | 64 | database_name: ${secrets.mysql.database} |
65 | database_port: ${secrets.mysql.port} | 65 | database_user: ${secrets.mysql.user} |
66 | database_name: ${secrets.mysql.database} | 66 | database_password: ${secrets.mysql.password} |
67 | database_user: ${secrets.mysql.user} | 67 | database_server_version: ${pkgs.mariadb.mysqlVersion} |
68 | database_password: ${secrets.mysql.password} | 68 | mailer_transport: smtp |
69 | database_server_version: ${pkgs.mariadb.mysqlVersion} | 69 | mailer_host: 127.0.0.1 |
70 | mailer_transport: smtp | 70 | mailer_user: null |
71 | mailer_host: 127.0.0.1 | 71 | mailer_password: null |
72 | mailer_user: null | 72 | secret: ${secrets.secret} |
73 | mailer_password: null | 73 | pdflatex: "${texlive}/bin/pdflatex" |
74 | secret: ${secrets.secret} | 74 | leapt_im: |
75 | pdflatex: "${texlive}/bin/pdflatex" | 75 | binary_path: ${pkgs.imagemagick}/bin |
76 | leapt_im: | 76 | ''; |
77 | binary_path: ${pkgs.imagemagick}/bin | 77 | }; |
78 | ''; | ||
79 | } | ||
80 | ]; | ||
81 | 78 | ||
82 | services.websites.env.integration.vhostConfs.piedsjaloux_integration = { | 79 | services.websites.env.integration.vhostConfs.piedsjaloux_integration = { |
83 | certName = "integration"; | 80 | certName = "integration"; |