Remove use of environment variables

[perso/Immae/Config/Nix.git] / virtual / modules / websites / connexionswing / connexionswing.nix

diff --git a/virtual/modules/websites/connexionswing/connexionswing.nix b/virtual/modules/websites/connexionswing/connexionswing.nix
index 90cca73b6181b5462b6cd4a7b91bdd7e350012c9..66c9b53673e1a4df8d7119ae3cccc72d59a619a8 100644 (file)
--- a/virtual/modules/websites/connexionswing/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing/connexionswing.nix
@@ -1,30 +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 =
-      # FIXME: spool emails in prod for when immae.eu is down?
-      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";
@@ -149,11 +144,6 @@ let
       '';
     };
     webappDir = stdenv.mkDerivation (fetchedGitPrivate ./connexionswing.json // rec {
-      # FIXME: can we do better than symlink?
-      # FIXME: imagick optional
-      # FIXME: initial sync
-      # FIXME: backup
-      # FIXME: replace with pkgs.phpPackages.composer
       buildPhase = ''
         export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt
         export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt