Move tools websites to stable web directories

1 files changed, 4 insertions, 5 deletions

diff --git a/nixops/modules/websites/tools/git/gitweb/gitweb.nix b/nixops/modules/websites/tools/git/gitweb/gitweb.nix
index 22c70f2..2ee7a63 100644
--- a/nixops/modules/websites/tools/git/gitweb/gitweb.nix
+++ b/nixops/modules/websites/tools/git/gitweb/gitweb.nix
@@ -29,10 +29,12 @@ rec {
     $project_list_default_category = "__Others__";
     $highlight_bin = "${highlight}/bin/highlight";
     '';
-  apache = {
+  apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "cgid" ];
+    webappName = "tools_gitweb";
+    root = "/run/current-system/webapps/${webappName}";
     vhostConf = ''
       SetEnv GIT_PROJECT_ROOT ${varDir}/repositories/
       ScriptAliasMatch \
@@ -44,13 +46,10 @@ rec {
                                   git-(upload|receive)-pack))$" \
                   ${git}/libexec/git-core/git-http-backend/$1
 
-      <Directory "${gitolite}">
-        Require all granted
-      </Directory>
       <Directory "${git}/libexec/git-core">
         Require all granted
       </Directory>
-      <Directory "${webRoot}">
+      <Directory "${root}">
         DirectoryIndex gitweb.cgi
         Require all granted
         AllowOverride None