Remove use of environment variables

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

diff --git a/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix b/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix
index c1cb60d7e8e99635da3a36b72a267a8bf4c09c72..bc2ff3a1127f1cc0f37a6b02794bbb246383688e 100644 (file)
--- a/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix
+++ b/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix
@@ -1,4 +1,4 @@
-{ lib, checkEnv, writeText, stdenv, fetchurl, fetchedGithub }:
+{ lib, env, writeText, stdenv, fetchurl, fetchedGithub }:
 let
   mantisbt = let
     plugins = {
@@ -18,17 +18,14 @@ let
     };
   in rec {
     config = 
-      assert checkEnv "NIXOPS_MANTISBT_DB_PASSWORD";
-      assert checkEnv "NIXOPS_MANTISBT_MASTER_SALT";
-      assert checkEnv "NIXOPS_MANTISBT_LDAP_PASSWORD";
       writeText "config_inc.php" ''
       <?php
       $g_hostname              = 'db-1.immae.eu';
       $g_db_username           = 'mantisbt';
-      $g_db_password           = '${builtins.getEnv "NIXOPS_MANTISBT_DB_PASSWORD"}';
+      $g_db_password           = '${env.postgresql.password}';
       $g_database_name         = 'mantisbt';
       $g_db_type               = 'pgsql';
-      $g_crypto_master_salt    = '${builtins.getEnv "NIXOPS_MANTISBT_MASTER_SALT"}';
+      $g_crypto_master_salt    = '${env.master_salt}';
       $g_allow_signup          = OFF;
       $g_allow_anonymous_login = ON;
       $g_anonymous_account     = 'anonymous';
@@ -48,7 +45,7 @@ let
       $g_ldap_server = 'ldaps://ldap.immae.eu:636';
       $g_ldap_root_dn = 'ou=users,dc=immae,dc=eu';
       $g_ldap_bind_dn = 'cn=mantisbt,ou=services,dc=immae,dc=eu';
-      $g_ldap_bind_passwd = '${builtins.getEnv "NIXOPS_MANTISBT_LDAP_PASSWORD"}';
+      $g_ldap_bind_passwd = '${env.ldap.password}';
       $g_use_ldap_email = ON;
       $g_use_ldap_realname = ON;
       $g_ldap_uid_field = 'uid';