X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Fconnexionswing%2Fconnexionswing.nix;fp=virtual%2Fmodules%2Fwebsites%2Fconnexionswing%2Fconnexionswing.nix;h=66c9b53673e1a4df8d7119ae3cccc72d59a619a8;hb=9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d;hp=71f3c0b232a39adf4b381318cb2a13b6cc127c7d;hpb=0f3047a77ee1e0b3d943e39d50301ba85821c572;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/connexionswing/connexionswing.nix b/virtual/modules/websites/connexionswing/connexionswing.nix
index 71f3c0b..66c9b53 100644
--- a/virtual/modules/websites/connexionswing/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing/connexionswing.nix
@@ -1,29 +1,25 @@
-{ lib, checkEnv, writeText, fetchedGitPrivate, stdenv, php, git, cacert }:
+{ lib, writeText, fetchedGitPrivate, stdenv, php, git, cacert }:
 let
-  connexionswing = { environment ? "dev" }: rec {
+  connexionswing = { config }: rec {
+    environment = config.environment;
     varDir = "/var/lib/connexionswing_${environment}";
     envName= lib.strings.toUpper environment;
     configRoot =
-      assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_PASSWORD";
-      assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_USER";
-      assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_NAME";
-      assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_SECRET";
-      assert checkEnv "NIXOPS_CONNEXIONSWING_${envName}_EMAIL";
       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_CONNEXIONSWING_${envName}_MYSQL_NAME"}
-            database_user: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_MYSQL_USER"}
-            database_password: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${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
-            subscription_email: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_EMAIL"}
+            subscription_email: ${config.email}
             allow_robots: true
-            secret: ${builtins.getEnv "NIXOPS_CONNEXIONSWING_${envName}_SECRET"}
+            secret: ${config.secret}
       '';
     phpFpm = rec {
       socket = "/var/run/phpfpm/connexionswing-${environment}.sock";