Added a possible level of decentralisation

diff --git a/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn b/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
index 35feacb714f6d7d3355bb06eb3c2c519b653ec99..d6340970029f9978dd2c476a83ffdd77fb47ac71 100644 (file)
--- a/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
+++ b/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
@@ -37,6 +37,8 @@ it on a remote machine, and tell Ikiwiki to use it instead of its local one. We
 will also ensure that the wiki is rendered whenever a commit is done to the git
 repository.
 
 will also ensure that the wiki is rendered whenever a commit is done to the git
 repository.
 

+[[!img separate-web-git-servers.svg size=400x]]
+

 # Conventions
 
 - We are building a wiki called *SITE*.
 # Conventions
 
 - We are building a wiki called *SITE*.

diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index c0397d2db462e3a316f441b48f635c30ebce347a..503b9eddbd36f0f365f7572311d3ca0d7b3147af 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
 
 
 ## 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/]]
 
  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:
 
 
 Here's a graphic overview of those:
 


@@ -34,6 +35,15 @@ This is the configuration described in
 hosts the HTML files, the ikiwiki [[cgi]] but everything else is on
 the git server.
 
 hosts the HTML files, the ikiwiki [[cgi]] but everything else is on
 the git server.
 

+### Separate ikiwiki web server, and git server
+
+[[!img Hosting_Ikiwiki_and_master_git_repository_on_different_machines/separate-web-git-servers.svg size=400x]]
+
+This is the configuration described in
+[[tips/Git_repository_and_web_server_on_different_hosts]]. One server hosts the web server (and the [[Ikiwiki cgi|cgi]]) and the git source dir; a second server hosts the git bare repository.
+
+
+

 ### Decentralised pinger setup
 
 [[!img ping-setup.svg size=400x]]
 ### Decentralised pinger setup
 
 [[!img ping-setup.svg size=400x]]