Merge branch 'master' of braunbox:~hurd-web/hurd-web

2 files changed, 10 insertions, 21 deletions

diff --git a/public_hurd_boxen/installation/darnassus.mdwn b/public_hurd_boxen/installation/darnassus.mdwn
index 3beb2c87..8cb8f619 100644
--- a/public_hurd_boxen/installation/darnassus.mdwn
+++ b/public_hurd_boxen/installation/darnassus.mdwn
@@ -13,7 +13,7 @@ License|/fdl]]."]]"""]]
 
 # Packages
 
-  * apache2-mpm-worker
+  * apache2-mpm-prefork (used to be apache2-mpm-worker but changed because of some threading issues with CGI)
 
   * ikiwiki libcgi-session-perl libtext-csv-perl libcgi-formbuilder-perl
     libauthen-passphrase-perl libnet-openid-consumer-perl
@@ -27,15 +27,14 @@ License|/fdl]]."]]"""]]
 
       * libyaml-perl libyaml-syck-perl (for ikiwiki's YAML field plugins)
 
-  * gitweb
+  * gitweb highlight
 
-        sudo ln -s ~hurd-web/hurd-web.git /var/cache/git/
+        sudo ln -s ~hurd-web/hurd-web.git /var/lib/git/
 
   * git-daemon-sysvinit
 
     Enable as per `/usr/share/doc/git-daemon-sysvinit/README.Debian`.  Also set
-    `GIT_DAEMON_OPTIONS=--user-path`, and `GIT_DAEMON_DIRECTORY='/var/cache/git
-    /home'`.  TODO: does not work if `ok_paths` is set, which it is by default.
+    `GIT_DAEMON_OPTIONS=--export-all`, and `GIT_DAEMON_DIRECTORY='/var/lib/git'`.
 
 
 # `~hurd-web/`
diff --git a/source_repositories.mdwn b/source_repositories.mdwn
index 726748ed..b2849500 100644
--- a/source_repositories.mdwn
+++ b/source_repositories.mdwn
@@ -35,6 +35,7 @@ This page is meant to give some guidelines.  Please use good sense or ask on
     ([[microkernel/viengoos/building]])
   * hurd/web.git -- [[contributing/Web_pages]]
 
+Mirror for faster anonymous accesses : <http://darnassus.sceen.net/gitweb/?a=project_list;pf=savannah_mirror>
 
 ## Branches
 
@@ -213,25 +214,14 @@ branches, like an imaginary
 # Git repositories on darnassus
 
 [[darnassus|public hurd boxen]] is
-**meant to be**
 [[configured|public_hurd_boxen/installation/darnassus]] in a way so that users
-can publish Git repositories from their home directories.  The only thing to do
-is to put an empty `.git/git-daemon-export-ok` (cf. [*git daemon*'s manual
-page](http://www.kernel.org/pub/software/scm/git/docs/git-daemon.html)) into
-the repository, or just `git-daemon-export-ok` for
-[*bare*](http://www.kernel.org/pub/software/scm/git/docs/git-init.html)
-repositories.
-
-<!--
-
-For example, the [[contributing/web_pages]] repository is made available like
-this: `~hurd-web/hurd-web.git` is a bare repository; there is an empty
-`~hurd-web/hurd-web.git/git-daemon-export-ok` file.  Users can clone the
-repository like this:
+can publish Git repositories in /var/lib/git.  It is recommended to store the
+repositories in the home directory and create links in /var/lib/git since /home
+is much larger than the root file system.  All repositories in /var/lib/git are
+automatically exported.  A gitweb interface (that also provides git:// and
+http:// clone URLs) is available at <http://darnassus.sceen.net/gitweb/>.
 
-    $ git clone git://darnassus.sceen.net/~hurd-web/hurd-web
 
--->
 
 # Git repositories on flubber