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 1aa2d877eca702481767d10cfdbf0a63f247f135..877ea8b9cbf501f79bde2cc470601b104961f569 100644 (file)
--- a/virtual/modules/websites/tools/tools/roundcubemail.nix
+++ b/virtual/modules/websites/tools/tools/roundcubemail.nix
@@ -1,10 +1,9 @@
-{ lib, checkEnv, writeText, stdenv, fetchurl }:
+{ lib, env, writeText, stdenv, fetchurl }:
 let
   roundcubemail = let
     plugins = {};
   in rec {
     varDir = "/var/lib/roundcubemail";
-    # FIXME: initial sync
     activationScript = {
       deps = [ "wrappers" ];
       text = ''
@@ -13,13 +12,9 @@ let
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
       '';
     };
-    config =
-      # FIXME: LOG_DESTINATION syslog?
-      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';
@@ -29,7 +24,7 @@ let
 
         $config['support_url'] = ''';
 
-        $config['des_key'] = '${builtins.getEnv "NIXOPS_ROUNDCUBEMAIL_SECRET"}';
+        $config['des_key'] = '${env.secret}';
 
         $config['plugins'] = array();