Remove webappdirs

[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 56e44015c645e32297fb41ac871686450b2c20f1..8f611ee85fb40157c2a5ac988a8c0a53940a6bf8 100644 (file)
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -3,6 +3,7 @@ let
     mantisbt = pkgs.callPackage ./mantisbt.nix {
       inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins;
       env = config.myEnv.tools.mantisbt;
+      inherit config;
     };
     gitweb = pkgs.callPackage ./gitweb.nix {
       gitoliteDir = config.myServices.gitolite.gitoliteDir;
@@ -19,8 +20,6 @@ in {
     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.env.tools.vhostConfs.git = {
@@ -43,6 +42,7 @@ in {
         user = config.services.httpd.Tools.user;
         group = config.services.httpd.Tools.group;
         settings = mantisbt.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
     };
   };