X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Fpiedsjaloux%2Fpiedsjaloux.nix;h=3d30b894a8f03e9f3126e4053743e0a90893b31d;hb=9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d;hp=4bbf148f2b37cd568d0dc60114c0ff48173e084f;hpb=0f3047a77ee1e0b3d943e39d50301ba85821c572;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/piedsjaloux/piedsjaloux.nix b/virtual/modules/websites/piedsjaloux/piedsjaloux.nix
index 4bbf148..3d30b89 100644
--- a/virtual/modules/websites/piedsjaloux/piedsjaloux.nix
+++ b/virtual/modules/websites/piedsjaloux/piedsjaloux.nix
@@ -1,27 +1,22 @@
-{ lib, checkEnv, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages, texlive, imagemagick }:
+{ lib, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages, texlive, imagemagick }:
 let
-  piedsjaloux = { environment ? "dev" }: rec {
-    varPrefix = "PIEDSJALOUX";
+  piedsjaloux = { config }: rec {
+    environment = config.environment;
     varDir = "/var/lib/piedsjaloux_${environment}";
-    envName= lib.strings.toUpper environment;
     configRoot =
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_NAME";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_SECRET";
       writeText "parameters.yml" ''
         # This file is auto-generated during the composer install
         parameters:
             database_host: db-1.immae.eu
             database_port: null
-            database_name: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_NAME"}
-            database_user: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER"}
-            database_password: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD"}
+            database_name: ${config.mysql.name}
+            database_user: ${config.mysql.user}
+            database_password: ${config.mysql.password}
             mailer_transport: smtp
             mailer_host: mail.immae.eu
             mailer_user: null
             mailer_password: null
-            secret: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_SECRET"}
+            secret: ${config.secret}
             pdflatex: "${texlive.combine { inherit (texlive) attachfile preprint scheme-small; }}/bin/pdflatex"
         leapt_im:
             binary_path: ${imagemagick}/bin