Added a possible level of decentralisation

master
Louis 2014-04-26 16:31:50 +02:00
parent 053137ea50
commit 06977a2994
2 changed files with 15 additions and 3 deletions

View File

@ -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.
[[!img separate-web-git-servers.svg size=400x]]
# Conventions
- We are building a wiki called *SITE*.

View File

@ -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,15 @@ This is the configuration described in
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]]