nixos/gitolite: don't leak nix store hash into gitolite-admin usernam…

…e/key It doesn't look good when the initial admin user is named "<hash>-gitolite-admin" and the key stored as "<hash>-gitolite-admin.pub". Instead, make it simply "gitolite-admin" and "gitolite-admin.pub". (cherry picked from commit 6b9ee30)
NixOS · Sep 12, 2017 · b98fda5 · b98fda5
1 parent 898924e
commit b98fda5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
@@ -4,7 +4,8 @@ with lib;
 
 let
   cfg = config.services.gitolite;
-  pubkeyFile = pkgs.writeText "gitolite-admin.pub" cfg.adminPubkey;
+  # Use writeTextDir to not leak Nix store hash into file name
+  pubkeyFile = (pkgs.writeTextDir "gitolite-admin.pub" cfg.adminPubkey) + "/gitolite-admin.pub";
   hooks = lib.concatMapStrings (hook: "${hook} ") cfg.commonHooks;
 in
 {