X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fgitolite%2Fdefault.nix;h=b4ae71ee559e6058779115d887be383a3605c414;hb=c4ce398447c0e71d1a448c3ef42bf8737867ccc5;hp=6b573e3931bbee97ae9fd21f5191b480530cb232;hpb=546864bc7d2d452803baafcb5d30438924e1d223;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/gitolite/default.nix b/modules/private/gitolite/default.nix
index 6b573e3..b4ae71e 100644
--- a/modules/private/gitolite/default.nix
+++ b/modules/private/gitolite/default.nix
@@ -15,19 +15,14 @@ in {
       snippet = builtins.readFile ./ldap_gitolite.sh;
       dependencies = [ pkgs.gitolite ];
     }];
-    services.duplyBackup.profiles.gitolite = {
-      rootDir = cfg.gitoliteDir;
-      remotes = [ "eriomem" "ovh" ];
-    };
     networking.firewall.allowedTCPPorts = [ 9418 ];
 
-    secrets.keys = [{
-      dest = "gitolite/ldap_password";
+    secrets.keys."gitolite/ldap_password" = {
       user = "gitolite";
       group = "gitolite";
       permissions = "0400";
       text = config.myEnv.tools.gitolite.ldap.password;
-    }];
+    };
 
     services.gitDaemon = {
       enable = true;
@@ -66,15 +61,18 @@ in {
         simplejson
         urllib3
         sleekxmpp
+        pyyaml
       ];
     in
       [
         (pkgs.python3.withPackages python-packages)
+        pkgs.nettools
+        pkgs.findutils
       ];
     # Installation: https://git.immae.eu/mantisbt/view.php?id=93
     services.gitolite = {
       enable = true;
-      adminPubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXqRbiHw7QoHADNIEuo4nUT9fSOIEBMdJZH0bkQAxXyJFyCM1IMz0pxsHV0wu9tdkkr36bPEUj2aV5bkYLBN6nxcV2Y49X8bjOSCPfx3n6Own1h+NeZVBj4ZByrFmqCbTxUJIZ2bZKcWOFncML39VmWdsVhNjg0X4NBBehqXRIKr2gt3E/ESAxTYJFm0BnU0baciw9cN0bsRGqvFgf5h2P48CIAfwhVcGmPQnnAwabnosYQzRWxR0OygH5Kd8mePh6FheIRIigfXsDO8f/jdxwut8buvNIf3m5EBr3tUbTsvM+eV3M5vKGt7sk8T64DVtepTSdOOWtp+47ktsnHOMh immae@immae.eu";
+      adminPubkey = config.myEnv.sshd.rootKeys.immae_dilion;
     };
   };
 }