diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-11 20:53:31 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-11 20:53:31 +0200 |
commit | 0b3f9cb9fde5929f361e91f6ed5b43958665f3d5 (patch) | |
tree | 053739b02f2c94150e6eeecd9a8403a72265dad2 /modules | |
parent | 22ba294f88a3d58db170d96324be41acd70b46f5 (diff) | |
download | Nix-0b3f9cb9fde5929f361e91f6ed5b43958665f3d5.tar.gz Nix-0b3f9cb9fde5929f361e91f6ed5b43958665f3d5.tar.zst Nix-0b3f9cb9fde5929f361e91f6ed5b43958665f3d5.zip |
Adjust some library functions
Diffstat (limited to 'modules')
-rw-r--r-- | modules/private/gitolite/default.nix | 16 | ||||
-rw-r--r-- | modules/private/ssh/default.nix | 11 |
2 files changed, 13 insertions, 14 deletions
diff --git a/modules/private/gitolite/default.nix b/modules/private/gitolite/default.nix index 9f5c179..1549c94 100644 --- a/modules/private/gitolite/default.nix +++ b/modules/private/gitolite/default.nix | |||
@@ -28,14 +28,14 @@ in { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | system.activationScripts.gitolite = let | 30 | system.activationScripts.gitolite = let |
31 | gitolite_ldap_groups = pkgs.mylibs.wrap { | 31 | deps = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.coreutils ]; |
32 | name = "gitolite_ldap_groups.sh"; | 32 | gitolite_ldap_groups = pkgs.runCommand "gitolite_ldap_groups.sh" { |
33 | file = ./gitolite_ldap_groups.sh; | 33 | buildInputs = [ pkgs.makeWrapper ]; |
34 | vars = { | 34 | } '' |
35 | LDAP_PASS = config.myEnv.tools.gitolite.ldap.password; | 35 | makeWrapper "${./gitolite_ldap_groups.sh}" "$out" \ |
36 | }; | 36 | --prefix PATH : ${lib.makeBinPath deps} \ |
37 | paths = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.coreutils ]; | 37 | --set LDAP_PASS ${pkgs.lib.escapeShellArg config.myEnv.tools.gitolite.ldap.password} |
38 | }; | 38 | ''; |
39 | in { | 39 | in { |
40 | deps = [ "users" ]; | 40 | deps = [ "users" ]; |
41 | text = '' | 41 | text = '' |
diff --git a/modules/private/ssh/default.nix b/modules/private/ssh/default.nix index 1699104..aea3ac0 100644 --- a/modules/private/ssh/default.nix +++ b/modules/private/ssh/default.nix | |||
@@ -77,12 +77,11 @@ in | |||
77 | substituteAll ${./ldap_authorized_keys.sh} $out | 77 | substituteAll ${./ldap_authorized_keys.sh} $out |
78 | chmod a+x $out | 78 | chmod a+x $out |
79 | ''; | 79 | ''; |
80 | ldap_authorized_keys = | 80 | ldap_authorized_keys = pkgs.runCommand "ldap_authorized_keys" { |
81 | pkgs.mylibs.wrap { | 81 | buildInputs = [ pkgs.makeWrapper ]; |
82 | name = "ldap_authorized_keys"; | 82 | } '' |
83 | file = fullScript; | 83 | makeWrapper "${fullScript}" "$out" --prefix PATH : ${lib.makeBinPath deps} |
84 | paths = deps; | 84 | ''; |
85 | }; | ||
86 | in { | 85 | in { |
87 | enable = true; | 86 | enable = true; |
88 | mode = "0755"; | 87 | mode = "0755"; |