Merge branch 'master' into sipb

[ikiwiki.git] / doc / tips / distributed_wikis.mdwn

diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index c0397d2db462e3a316f441b48f635c30ebce347a..2547a2e9fe510bdbb8ab22a06f847d1a47aaac47 100644 (file)
--- a/doc/tips/distributed_wikis.mdwn
+++ b/doc/tips/distributed_wikis.mdwn
@@ -7,12 +7,13 @@ git, let's explore some possibilities for distributed wikis.
 
 ## Overview
 
-There are three possible level of decentralisation:
+There are several possible level of decentralisation:
 
  0. [[default setup|rcs/git]], no decentralisation
  1. [[a simple HTML mirror|tips/Git_repository_and_web_server_on_different_hosts/]]
- 2. separate `srcdir`, still requires a central bare repo - uses [[plugins/pinger]]
- 3. completely distinct ikiwiki installs, synchronised with [[plugins/contrib/gitpush]]
+ 2. [[separate ikiwiki and git servers|tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines]]
+ 3. separate `srcdir`, still requires a central bare repo - uses [[plugins/pinger]]
+ 4. completely distinct ikiwiki installs, synchronised with [[plugins/contrib/gitpush]]
 
 Here's a graphic overview of those:
 
@@ -34,6 +35,13 @@ This is the configuration described in
 hosts the HTML files, the ikiwiki [[cgi]] but everything else is on
 the git server.
 
+### Separate webserver and git repository, the git srcdir being hosted on the webserver
+
+[[!img Hosting_Ikiwiki_and_master_git_repository_on_different_machines/separate-web-git-servers.svg size=400x]]
+
+This is the configuration described in
+[[tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines]]. One server hosts the web server (and the [[Ikiwiki cgi|cgi]]) and the git source dir; a second server hosts the git bare repository. This can be used when you have very limited access to the git server.
+
 ### Decentralised pinger setup
 
 [[!img ping-setup.svg size=400x]]