From 9e566efb242f47b9f4a9bdf4657b920b2ed61217 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Wed, 11 Sep 2019 16:12:06 -0700
Subject: [depo] some refactoring

---
 depo/nutin-madaj/git.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'depo/nutin-madaj/git.nix')

diff --git a/depo/nutin-madaj/git.nix b/depo/nutin-madaj/git.nix
index c40e8b9..e61abb4 100644
--- a/depo/nutin-madaj/git.nix
+++ b/depo/nutin-madaj/git.nix
@@ -1,23 +1,18 @@
 { pkgs, ... }:
 
-let
-  benKey =  "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiNB0iF9ClawNEizBtdYucqp1tAXXRbqvlPS6PFRrtiwSl+SJD29BCLgA5rLxcmFhBHZ/iId/En7GPFEzI/gMu071J7pUI4OcW0UVZju3GNc6ZEz/a6AD2u79JiXEDHfPEdmMqAe36kkaK0KJWSQP3xsFRwJ+8F8HHbSwoCLL+GJhBgAWHQLGfKesNrDacNljNDU3CgkEnDmu8QKuSzH2k1vrr69q2u2iMSAdiStDBAWEjN5nCVrm2XB2vmFLMtXpX2n8JI+znOGzRRDc8dNXejQeDMZGyV6jfVidEIX7vdgSydGjTRKcCLVAsKY3z0gYBZ8u8EUNujgcFBnnAvytj ben@neb";
-  gitDir = "/srv/git";
-in
 {
   services = {
-
     gitolite = {
       enable = true;
       enableGitAnnex = true;
-      dataDir = "${gitDir}";
+      # TODO: change this to /var/lib/gitolite?
+      dataDir = "/srv/git";
       user = "git";
       group = "git";
       extraGitoliteRc = ''
         $RC{SITE_INFO} = 'a computer is a bicycle for the mind.';
-        $RC{GIT_CONFIG_KEYS} = 'gitweb\.(owner|description|category)';
       '';
-      adminPubkey = "${benKey}";
+      adminPubkey = builtins.readFile ../../keys/ben.pub;
     };
   };
 }
-- 
cgit v1.2.3