Remove use of environment variables

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

1 files changed, 3 insertions, 5 deletions

diff --git a/virtual/modules/gitolite/default.nix b/virtual/modules/gitolite/default.nix
index b8ecb15..21eabc4 100644
--- a/virtual/modules/gitolite/default.nix
+++ b/virtual/modules/gitolite/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
     cfg = config.services.myGitolite;
 in {
@@ -33,14 +33,12 @@ in {
       basePath = "${cfg.gitoliteDir}/repositories";
     };
 
-    system.activationScripts.gitolite =
-      assert mylibs.checkEnv "NIXOPS_GITOLITE_LDAP_PASSWORD";
-      let
+    system.activationScripts.gitolite = let
       gitolite_ldap_groups = mylibs.wrap {
         name = "gitolite_ldap_groups.sh";
         file = ./gitolite_ldap_groups.sh;
         vars = {
-          LDAP_PASS = builtins.getEnv "NIXOPS_GITOLITE_LDAP_PASSWORD";
+          LDAP_PASS = myconfig.env.tools.gitolite.ldap.password;
         };
         paths = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.coreutils ];
       };