Add specification for the private config file as a module.

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

diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index 3e8b605774167b82b842e95eb72b786377d052a7..a5f525bdad765308c97f6efc7f3e6fe637c8db37 100644 (file)
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -1,10 +1,12 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
 let
     mantisbt = pkgs.callPackage ./mantisbt.nix {
       inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins;
-      env = myconfig.env.tools.mantisbt;
+      env = config.myEnv.tools.mantisbt;
+    };
+    gitweb = pkgs.callPackage ./gitweb.nix {
+      gitoliteDir = config.myServices.gitolite.gitoliteDir;
     };
-    gitweb = pkgs.callPackage ./gitweb.nix { gitoliteDir = config.services.myGitolite.gitoliteDir; };
 
     cfg = config.myServices.websites.tools.git;
 in {
@@ -14,14 +16,14 @@ in {
 
   config = lib.mkIf cfg.enable {
     secrets.keys = mantisbt.keys;
-    services.websites.tools.modules =
+    services.websites.env.tools.modules =
       gitweb.apache.modules ++
       mantisbt.apache.modules;
     myServices.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot;
     myServices.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot;
 
     system.activationScripts.mantisbt = mantisbt.activationScript;
-    services.websites.tools.vhostConfs.git = {
+    services.websites.env.tools.vhostConfs.git = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["git.immae.eu" ];