3 files changed, 1 insertions, 89 deletions

diff --git a/virtual/packages/adminer.nix b/virtual/packages/adminer.nix
index d2800aa..7094e45 100644
--- a/virtual/packages/adminer.nix
+++ b/virtual/packages/adminer.nix
@@ -39,7 +39,7 @@ let
       vhostConf = ''
         Alias /adminer ${webRoot}
         <Directory ${webRoot}>
-          DirectoryIndex = index.php
+          DirectoryIndex index.php
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
           </FilesMatch>
diff --git a/virtual/packages/gitweb.conf b/virtual/packages/gitweb.conf
deleted file mode 100644
index 0d5f50d..0000000
--- a/virtual/packages/gitweb.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-$git_temp = "/tmp";
-
-# The directories where your projects are. Must not end with a slash.
-$projectroot = "/srv/git/repositories"; 
-
-$projects_list = "/srv/git/projects.list";
-$strict_export = "true";
-
-# Base URLs for links displayed in the web interface.
-our @git_base_url_list = qw(ssh://gitolite@git.immae.eu https://git.immae.eu);
-
-$feature{'blame'}{'default'} = [1];
-$feature{'avatar'}{'default'} = ['gravatar'];
-$feature{'highlight'}{'default'} = [1];
-
-@stylesheets = ("gitweb-theme/gitweb.css");
-$logo = "gitweb-theme/git-logo.png";
-$favicon = "gitweb-theme/git-favicon.png";
-
-$javascript = "gitweb-theme/gitweb.js";
-$logo_url = "https://git.immae.eu/";
-$projects_list_group_categories = "true";
-$projects_list_description_width = 60;
-$project_list_default_category = "__Others__";
diff --git a/virtual/packages/gitweb.nix b/virtual/packages/gitweb.nix
deleted file mode 100644
index 1c2430a..0000000
--- a/virtual/packages/gitweb.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ gitweb, writeText, gitolite, git }:
-rec {
-  varDir = "/var/lib/gitolite";
-  webRoot = gitweb;
-  config = writeText "gitweb.conf" ''
-    $git_temp = "/tmp";
-
-    # The directories where your projects are. Must not end with a
-    # slash.
-    $projectroot = "${varDir}/repositories";
-
-    $projects_list = "${varDir}/projects.list";
-    $strict_export = "true";
-
-    # Base URLs for links displayed in the web interface.
-    our @git_base_url_list = qw(ssh://gitolite@git.immae.eu https://git.immae.eu);
-
-    $feature{'blame'}{'default'} = [1];
-    $feature{'avatar'}{'default'} = ['gravatar'];
-    $feature{'highlight'}{'default'} = [1];
-
-    @stylesheets = ("gitweb-theme/gitweb.css");
-    $logo = "gitweb-theme/git-logo.png";
-    $favicon = "gitweb-theme/git-favicon.png";
-    $javascript = "gitweb-theme/gitweb.js";
-    $logo_url = "https://git.immae.eu/";
-    $projects_list_group_categories = "true";
-    $projects_list_description_width = 60;
-    $project_list_default_category = "__Others__";
-    '';
-  apache = {
-    user = "wwwrun";
-    group = "wwwrun";
-    modules = [ "cgid" ];
-    vhostConf = ''
-      SetEnv GIT_PROJECT_ROOT ${varDir}/repositories/
-      ScriptAliasMatch \
-                  "(?x)^/(.*/(HEAD | \
-                                  info/refs | \
-                                  objects/(info/[^/]+ | \
-                                          [0-9a-f]{2}/[0-9a-f]{38} | \
-                                          pack/pack-[0-9a-f]{40}\.(pack|idx)) | \
-                                  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}">
-        DirectoryIndex gitweb.cgi
-        Require all granted
-        AllowOverride None
-        Options ExecCGI FollowSymLinks
-        <Files gitweb.cgi>
-          SetHandler cgi-script
-          SetEnv  GITWEB_CONFIG  "${config}"
-        </Files>
-      </Directory>
-      '';
-  };
-}