3 files changed, 2 insertions, 7 deletions

diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index 755bab0..8f611ee 100644
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -20,8 +20,6 @@ in {
     services.websites.env.tools.modules =
       gitweb.apache.modules ++
       mantisbt.apache.modules;
-    services.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot;
-    services.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot;
 
     system.activationScripts.mantisbt = mantisbt.activationScript;
     services.websites.env.tools.vhostConfs.git = {
diff --git a/modules/private/websites/tools/git/gitweb.nix b/modules/private/websites/tools/git/gitweb.nix
index dab0c9e..ff34da5 100644
--- a/modules/private/websites/tools/git/gitweb.nix
+++ b/modules/private/websites/tools/git/gitweb.nix
@@ -1,7 +1,6 @@
 { gitweb, writeText, stdenv, coreutils, writeScript, gitolite, git, cgit, gitoliteDir, mailcap, highlight }:
 rec {
   varDir = gitoliteDir;
-  webRoot = gitweb;
   config = writeText "gitweb.conf" ''
     $git_temp = "/tmp";
 
@@ -77,8 +76,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "cgid" ];
-    webappName = "tools_gitweb";
-    root = "/run/current-system/webapps/${webappName}";
+    root = gitweb;
     vhostConf = ''
       SetEnv GIT_PROJECT_ROOT ${varDir}/repositories/
       ScriptAliasMatch \
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index 033a651..2ef76af 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -50,8 +50,7 @@ rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_mantisbt";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /mantisbt "${root}"
       <Directory "${root}">