diff options
Diffstat (limited to 'virtual/modules/gitolite/default.nix')
-rw-r--r-- | virtual/modules/gitolite/default.nix | 8 |
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 @@ | |||
1 | { lib, pkgs, config, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | cfg = config.services.myGitolite; | 3 | cfg = config.services.myGitolite; |
4 | in { | 4 | in { |
@@ -33,14 +33,12 @@ in { | |||
33 | basePath = "${cfg.gitoliteDir}/repositories"; | 33 | basePath = "${cfg.gitoliteDir}/repositories"; |
34 | }; | 34 | }; |
35 | 35 | ||
36 | system.activationScripts.gitolite = | 36 | system.activationScripts.gitolite = let |
37 | assert mylibs.checkEnv "NIXOPS_GITOLITE_LDAP_PASSWORD"; | ||
38 | let | ||
39 | gitolite_ldap_groups = mylibs.wrap { | 37 | gitolite_ldap_groups = mylibs.wrap { |
40 | name = "gitolite_ldap_groups.sh"; | 38 | name = "gitolite_ldap_groups.sh"; |
41 | file = ./gitolite_ldap_groups.sh; | 39 | file = ./gitolite_ldap_groups.sh; |
42 | vars = { | 40 | vars = { |
43 | LDAP_PASS = builtins.getEnv "NIXOPS_GITOLITE_LDAP_PASSWORD"; | 41 | LDAP_PASS = myconfig.env.tools.gitolite.ldap.password; |
44 | }; | 42 | }; |
45 | paths = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.coreutils ]; | 43 | paths = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.coreutils ]; |
46 | }; | 44 | }; |