Remove use of environment variables

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

2 files changed, 9 insertions, 9 deletions

diff --git a/virtual/modules/websites/tools/git/default.nix b/virtual/modules/websites/tools/git/default.nix
index f53350e..91aa1d0 100644
--- a/virtual/modules/websites/tools/git/default.nix
+++ b/virtual/modules/websites/tools/git/default.nix
@@ -1,6 +1,9 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    mantisbt = pkgs.callPackage ./mantisbt/mantisbt.nix { inherit (mylibs) checkEnv fetchedGithub; };
+    mantisbt = pkgs.callPackage ./mantisbt/mantisbt.nix {
+      inherit (mylibs) fetchedGithub;
+      env = myconfig.env.tools.mantisbt;
+    };
     gitweb = pkgs.callPackage ./gitweb/gitweb.nix { gitoliteDir = config.services.myGitolite.gitoliteDir; };
 
     cfg = config.services.myWebsites.tools.git;
diff --git a/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix b/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix
index c1cb60d..bc2ff3a 100644
--- 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';