X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fgit%2Fdefault.nix;h=ea0d9717ae152f2df53d288a048d74da56888a11;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=11b0245c1c29867d5f19b3df5277bb10ed2b1fab;hpb=2368a4b7e827b985c3758ad0bfe13e4a08d27c36;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix
index 11b0245..ea0d971 100644
--- a/nixops/modules/websites/tools/git/default.nix
+++ b/nixops/modules/websites/tools/git/default.nix
@@ -1,10 +1,10 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
 let
-    mantisbt = pkgs.callPackage ./mantisbt/mantisbt.nix {
-      inherit (mylibs) fetchedGithub;
+    mantisbt = pkgs.callPackage ./mantisbt.nix {
+      inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins;
       env = myconfig.env.tools.mantisbt;
     };
-    gitweb = pkgs.callPackage ./gitweb/gitweb.nix { gitoliteDir = config.services.myGitolite.gitoliteDir; };
+    gitweb = pkgs.callPackage ./gitweb.nix { gitoliteDir = config.services.myGitolite.gitoliteDir; };
 
     cfg = config.services.myWebsites.tools.git;
 in {
@@ -15,15 +15,8 @@ in {
   config = lib.mkIf cfg.enable {
     security.acme.certs."eldiron".extraDomains."git.immae.eu" = null;
 
-    nixpkgs.overlays = [ (self: super: rec {
-      gitweb = super.gitweb.overrideAttrs(old: {
-        installPhase = old.installPhase + ''
-          cp -r ${./gitweb/theme} $out/gitweb-theme;
-          '';
-      });
-    }) ];
-
-    services.myWebsites.tools.modules =
+    secrets.keys = mantisbt.keys;
+    services.websites.tools.modules =
       gitweb.apache.modules ++
       mantisbt.apache.modules;
     system.extraSystemBuilderCmds = ''
@@ -32,7 +25,7 @@ in {
       ln -s ${mantisbt.webRoot} $out/webapps/${mantisbt.apache.webappName}
       '';
 
-    services.myWebsites.tools.vhostConfs.git = {
+    services.websites.tools.vhostConfs.git = {
       certName    = "eldiron";
       hosts       = ["git.immae.eu" ];
       root        = gitweb.apache.root;