Remove use of environment variables

Fixes https://git.immae.eu/mantisbt/view.php?id=113

1 files changed, 10 insertions, 18 deletions

diff --git a/virtual/modules/websites/chloe/chloe.nix b/virtual/modules/websites/chloe/chloe.nix
index ca34b5a..dcf076d 100644
--- a/virtual/modules/websites/chloe/chloe.nix
+++ b/virtual/modules/websites/chloe/chloe.nix
@@ -1,18 +1,10 @@
-{ stdenv, lib, checkEnv, fetchzip, fetchurl, fetchedGitPrivate, sassc }:
+{ stdenv, lib, fetchzip, fetchurl, fetchedGitPrivate, sassc }:
 let
-  chloe = { environment ? "dev" }: rec {
-    varPrefix = "CHLOE";
-    envName= lib.strings.toUpper environment;
+  chloe = { config }: rec {
+    environment = config.environment;
     phpFpm = rec {
       socket = "/var/run/phpfpm/chloe-${environment}.sock";
-      pool = 
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_DB";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_LDAP_DN";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_LDAP_PASSWORD";
-      assert checkEnv "NIXOPS_${varPrefix}_${envName}_LDAP_SEARCH";
-      ''
+      pool = ''
         listen = ${socket}
         user = ${apache.user}
         group = ${apache.group}
@@ -28,13 +20,13 @@ let
         env[SPIP_SITE] = "chloe-${environment}"
         env[SPIP_LDAP_BASE] = "dc=immae,dc=eu"
         env[SPIP_LDAP_HOST] = "ldaps://ldap.immae.eu"
-        env[SPIP_LDAP_SEARCH_DN] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_DN"}"
-        env[SPIP_LDAP_SEARCH_PW] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_PASSWORD"}"
-        env[SPIP_LDAP_SEARCH] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_SEARCH"}"
+        env[SPIP_LDAP_SEARCH_DN] = "${config.ldap.dn}"
+        env[SPIP_LDAP_SEARCH_PW] = "${config.ldap.password}"
+        env[SPIP_LDAP_SEARCH] = "${config.ldap.search}"
         env[SPIP_MYSQL_HOST] = "db-1.immae.eu"
-        env[SPIP_MYSQL_DB] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_DB"}"
-        env[SPIP_MYSQL_USER] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER"}"
-        env[SPIP_MYSQL_PASSWORD] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD"}"
+        env[SPIP_MYSQL_DB] = "${config.mysql.name}"
+        env[SPIP_MYSQL_USER] = "${config.mysql.user}"
+        env[SPIP_MYSQL_PASSWORD] = "${config.mysql.password}"
         ${if environment == "dev" then ''
         pm = ondemand
         pm.max_children = 5