Remove use of environment variables

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

diff --git a/virtual/modules/websites/tools/tools/roundcubemail.nix b/virtual/modules/websites/tools/tools/roundcubemail.nix
index e1653ae5c3756b2673e3dfb31a2169a09e95e12b..877ea8b9cbf501f79bde2cc470601b104961f569 100644 (file)
--- a/virtual/modules/websites/tools/tools/roundcubemail.nix
+++ b/virtual/modules/websites/tools/tools/roundcubemail.nix
@@ -1,4 +1,4 @@
-{ lib, checkEnv, writeText, stdenv, fetchurl }:
+{ lib, env, writeText, stdenv, fetchurl }:
 let
   roundcubemail = let
     plugins = {};
@@ -12,12 +12,9 @@ let
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
       '';
     };
-    config =
-      assert checkEnv "NIXOPS_ROUNDCUBEMAIL_PSQL_URL";
-      assert checkEnv "NIXOPS_ROUNDCUBEMAIL_SECRET";
-      writeText "config.php" ''
+    config = writeText "config.php" ''
       <?php
-        $config['db_dsnw'] = '${builtins.getEnv "NIXOPS_ROUNDCUBEMAIL_PSQL_URL"}';
+        $config['db_dsnw'] = '${env.psql_url}';
         $config['default_host'] = 'ssl://mail.immae.eu';
         $config['imap_conn_options'] = array("ssl" => array("verify_peer" => false));
         $config['smtp_server'] = 'tls://mail.immae.eu';
@@ -27,7 +24,7 @@ let
 
         $config['support_url'] = ''';
 
-        $config['des_key'] = '${builtins.getEnv "NIXOPS_ROUNDCUBEMAIL_SECRET"}';
+        $config['des_key'] = '${env.secret}';
 
         $config['plugins'] = array();