openldap: no longer use networking.domain*

[sourcephile-nix.git] / servers / mermet / gitolite.nix

diff --git a/servers/mermet/gitolite.nix b/servers/mermet/gitolite.nix
index 97215cd5a163b8a9f8d0f3dc1a3ffcd42b8d5a9f..969d12cc3bf1dcdfceb5d30a3238cd6d0ca21077 100644 (file)
--- a/servers/mermet/gitolite.nix
+++ b/servers/mermet/gitolite.nix
@@ -1,10 +1,12 @@
 { pkgs, lib, config, ... }:
-let inherit (builtins.extraBuiltins) pass;
-    inherit (lib) types;
-    inherit (config) networking;
-    inherit (config.services) gitolite;
-    inherit (config.users) users groups;
-    gitolite-admin = "julm";
+let
+  inherit (builtins) readFile;
+  inherit (builtins.extraBuiltins) pass;
+  inherit (lib) types;
+  inherit (config) networking;
+  inherit (config.services) gitolite;
+  inherit (config.users) users groups;
+  gitolite-admin = "julm";
 in
 {
   # Make confortable to call gitolite from a shell
@@ -16,7 +18,7 @@ in
       enable = true;
       user   = "git";
       group  = users."git-daemon".name;
-      adminPubkey = pass "members/${gitolite-admin}/ssh.pub";
+      adminPubkey = (readFile ../../../sec/ssh/julm.pub);
       extraGitoliteRc = ''
         $RC{UMASK}           = 0027; # NOTE: no quote around in Perl, so it's octal
         $RC{LOG_DEST}        = 'repo-log,syslog';