Add specification for the private config file as a module.

2 files changed, 6 insertions, 6 deletions

diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index d66d151..a5f525b 100644
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -1,8 +1,8 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
 let
     mantisbt = pkgs.callPackage ./mantisbt.nix {
       inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins;
-      env = myconfig.env.tools.mantisbt;
+      env = config.myEnv.tools.mantisbt;
     };
     gitweb = pkgs.callPackage ./gitweb.nix {
       gitoliteDir = config.myServices.gitolite.gitoliteDir;
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index a1b830e..d0d7a98 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -35,15 +35,15 @@ rec {
       # --- LDAP ---
       $g_login_method = LDAP;
       $g_ldap_protocol_version = 3;
-      $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_server = 'ldaps://${env.ldap.host}:636';
+      $g_ldap_root_dn = 'ou=users,${env.ldap.base}';
+      $g_ldap_bind_dn = '${env.ldap.dn}';
       $g_ldap_bind_passwd = '${env.ldap.password}';
       $g_use_ldap_email = ON;
       $g_use_ldap_realname = ON;
       $g_ldap_uid_field = 'uid';
       $g_ldap_realname_field = 'cn';
-      $g_ldap_organization = '(memberOf=cn=users,cn=mantisbt,ou=services,dc=immae,dc=eu)';
+      $g_ldap_organization = '${env.ldap.filter}';
     '';
   }];
   webRoot = (mantisbt_2.override { mantis_config = "/var/secrets/webapps/tools-mantisbt"; }).withPlugins (builtins.attrValues mantisbt_2-plugins);