Move secrets module outside of nixops

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / git / default.nix

diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix
index 91aa1d042c7f19b41d52466b77017af8fe48ca10..799c18097269650e7ee10c994a312f0485311259 100644 (file)
--- a/nixops/modules/websites/tools/git/default.nix
+++ b/nixops/modules/websites/tools/git/default.nix
@@ -1,10 +1,11 @@
 { lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    mantisbt = pkgs.callPackage ./mantisbt/mantisbt.nix {
+    mantisbt = pkgs.callPackage ./mantisbt.nix {
       inherit (mylibs) fetchedGithub;
+      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,22 +16,20 @@ in {
   config = lib.mkIf cfg.enable {
     security.acme.certs."eldiron".extraDomains."git.immae.eu" = null;
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      gitweb = oldpkgs.gitweb.overrideAttrs(old: {
-        installPhase = old.installPhase + ''
-          cp -r ${./gitweb/theme} $out/gitweb-theme;
-          '';
-      });
-    };
-
+    secrets.keys = mantisbt.keys;
     services.myWebsites.tools.modules =
       gitweb.apache.modules ++
       mantisbt.apache.modules;
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${gitweb.webRoot} $out/webapps/${gitweb.apache.webappName}
+      ln -s ${mantisbt.webRoot} $out/webapps/${mantisbt.apache.webappName}
+      '';
 
     services.myWebsites.tools.vhostConfs.git = {
       certName    = "eldiron";
       hosts       = ["git.immae.eu" ];
-      root        = gitweb.webRoot;
+      root        = gitweb.apache.root;
       extraConfig = [
         gitweb.apache.vhostConf
         mantisbt.apache.vhostConf