From 9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 22 Jan 2019 12:49:20 +0100
Subject: Remove use of environment variables

Fixes https://git.immae.eu/mantisbt/view.php?id=113
---
 virtual/modules/websites/tellesflorian/default.nix |  8 ++++---
 .../websites/tellesflorian/tellesflorian.nix       | 25 ++++++++--------------
 2 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'virtual/modules/websites/tellesflorian')

diff --git a/virtual/modules/websites/tellesflorian/default.nix b/virtual/modules/websites/tellesflorian/default.nix
index 8f8c35a..f347169 100644
--- a/virtual/modules/websites/tellesflorian/default.nix
+++ b/virtual/modules/websites/tellesflorian/default.nix
@@ -1,9 +1,11 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
     adminer = pkgs.callPackage ../commons/adminer.nix {};
 
-    tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
-    tellesflorian_dev  = tellesflorian { environment = "dev"; };
+    tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) fetchedGitPrivate; };
+    tellesflorian_dev  = tellesflorian {
+      config = myconfig.env.websites.tellesflorian.integration;
+    };
 
     cfg = config.services.myWebsites.TellesFlorian;
 in {
diff --git a/virtual/modules/websites/tellesflorian/tellesflorian.nix b/virtual/modules/websites/tellesflorian/tellesflorian.nix
index 2191b31..03b1faf 100644
--- a/virtual/modules/websites/tellesflorian/tellesflorian.nix
+++ b/virtual/modules/websites/tellesflorian/tellesflorian.nix
@@ -1,27 +1,22 @@
-{ lib, checkEnv, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages }:
+{ lib, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages }:
 let
-  tellesflorian = { environment ? "dev" }: rec {
-    varPrefix = "TELLESFLORIAN";
+  tellesflorian = { config }: rec {
+    environment = config.environment;
     varDir = "/var/lib/tellesflorian_${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}
       '';
     phpFpm = rec {
       socket = "/var/run/phpfpm/floriantelles-${environment}.sock";
@@ -49,10 +44,8 @@ let
         pm.max_spare_servers = 3
         ''}'';
     };
-    passwords =
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_INVITE_PASSWORDS";
-      writeText "tellesflorian_passwords" ''
-      invite:${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_INVITE_PASSWORDS"}
+    passwords = writeText "tellesflorian_passwords" ''
+      invite:${config.invite_passwords}
       '';
     apache = {
       user = "wwwrun";
-- 
cgit v1.2.3