Added a comment

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

diff --git a/doc/tips/distributed_wikis.mdwn b/doc/tips/distributed_wikis.mdwn
index 4e084b25672cc489aff6b4527b215161cbd60773..1d8a8f5a91bddb9167f5495ca148cac64a9b483b 100644 (file)
--- a/doc/tips/distributed_wikis.mdwn
+++ b/doc/tips/distributed_wikis.mdwn
@@ -7,97 +7,65 @@ 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 [[plugin/pinger]]
- 3. completely distinct ikiwiki installs, synchronised with
-    [[plugin/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:
 
 ### Default setup - one central server
 
 
 Here's a graphic overview of those:
 
 ### Default setup - one central server
 

-[[!img rcs/git/wiki-edit-flow.svg size=490x align=center]]
+[[!img rcs/git/wiki_edit_flow.svg size=400x]]

 
 In the default setup, all the resources are stored on the central
 servers. Users can still clone and edit the git repo by hand and
 contribute by git, but otherwise all the changes happen on a single
 
 In the default setup, all the resources are stored on the central
 servers. Users can still clone and edit the git repo by hand and
 contribute by git, but otherwise all the changes happen on a single

-web interface.
+web interface. This basic setup is best described in [[rcs/git]].

 
 ### Separate webserver and git repository
 
 
 ### Separate webserver and git repository
 

-[[!img tips/Git_repository_and_web_server_on_different_hosts/separate-webserver.svg align=center]]
+[[!img tips/Git_repository_and_web_server_on_different_hosts/separate-webserver.svg size=400x]]

 
 

-In the configuration described in
-[[tips/Git_repository_and_web_server_on_different_hosts]], the
-webserver is separate from the git repository. The webserver part
+This is the configuration described in
+[[tips/Git_repository_and_web_server_on_different_hosts]]. The webserver part

 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 webserver and git repository, the git srcdir being hosted on the webserver
+
+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
 
 ### Decentralised pinger setup
 

-[[!img ping-setup.svg align=center]]
+[[!img ping-setup.svg size=400x]]

 
 In this configuration, the mirrors all have their own `srcdir`, but
 still need to push and pull from the same central bare git repo. The
 [[plugins/pinger]] plugin is used to ping the mirrors from the central
 server on edits.
 
 
 In this configuration, the mirrors all have their own `srcdir`, but
 still need to push and pull from the same central bare git repo. The
 [[plugins/pinger]] plugin is used to ping the mirrors from the central
 server on edits.
 

+Step by step setup instructions for this are detailed below.
+

 ### Fully decentralised setup
 
 ### Fully decentralised setup
 

-[[!img .svg align=center]]
+[[!img decentralized_wikis.svg size=400x]]

 
 In this configuration, each wiki is fully independent and pushes its
 
 In this configuration, each wiki is fully independent and pushes its

-changes to other wikis using the [[plugins/gitpush]] plugin.
-
-## a wiki mirror
-
-The simplest possibility is setting up a mirror. If a wiki exposes its git
-repository and has the [[plugins/pinger]] plugin enabled, then anyone can
-set up a mirror that will automatically be kept up-to-date with the origin
-wiki. Just clone the git repo, configure ikiwiki to use it, enable the
-[[plugins/pingee]] plugin in your configuration, and edit the origin wiki,
-adding a ping directive for your mirror:
-
-       \[[!ping from="http://thewiki.com/"
-       to="http://mymirror.com/ikiwiki.cgi?do=ping"]]
+changes to other wikis using the [[plugins/contrib/gitpush]] plugin.

 
 

-The "from" parameter needs to be the url to the origin wiki. The "to" parameter
-is the url to ping on your mirror.
-
-Now whenever the main wiki is edited, it will ping your mirror, which will
-pull the changes from "origin" using git, and update itself. It could, in
-turn ping another mirror, etc.
+## Step by step setup instructions

 
 

-And if someone edits a page on your mirror, it will "git push origin",
-committing the changes back to the origin git repository, and updating the
-origin mirror. Assuming you can push to that git repository. If you can't,
-and you want a mirror, and not a branch, you should disable web edits on
-your mirror. (You could also point the cgiurl for your mirror at the origin
-wiki.)
-
-## branching a wiki
-
-It follows that setting up a branch of a wiki is just like a mirror, except
-we don't want it to push changes back to the origin. The easy way to
-accomplish this is to clone the origin git repository using a readonly
-protocol (ie, "git://"). Then you can't push to it.
-
-If a page on your branch is modified and other modifications are made to
-the same page in the origin, a conflict might occur when that change is
-pulled in. How well will this be dealt with and how to resolve it? I think
-that the conflict markers will just appear on the page as it's rendered in
-the wiki, and if you could even resolve the conflict using the web
-interface. Not 100% sure as I've not gotten into this situation yet.
-
---[[Joey]]
-
-## Practical example
+The first two ways of setting up ikiwiki are better described in [[setup]] or [[tips/Git_repository_and_web_server_on_different_hosts]]. The remainder of this page describes the latter two more complex distributed setups. 

 
 Say you have a friend that has already configured a shiny ikiwiki site, and you want to help by creating a mirror. You still need to figure out how to install ikiwiki and everything, hopefully this section will help you with that.
 
 
 Say you have a friend that has already configured a shiny ikiwiki site, and you want to help by creating a mirror. You still need to figure out how to install ikiwiki and everything, hopefully this section will help you with that.
 

+Note that parts of the following documentation duplicate instructions from [[setup]], [[setup/byhand]], [[rcs/git]] and [[tips/laptop_wiki_with_git]].
+

 ### Installing ikiwiki
 
 You need to install the ikiwiki package for the mirror to work. You can use ikiwiki to publish the actual HTML pages elsewhere if you don't plan on letting people edit the wiki, but generally you want the package to be installed on the webserver for editing to work.
 ### Installing ikiwiki
 
 You need to install the ikiwiki package for the mirror to work. You can use ikiwiki to publish the actual HTML pages elsewhere if you don't plan on letting people edit the wiki, but generally you want the package to be installed on the webserver for editing to work.


@@ -143,7 +111,7 @@ You should already be able to make a plain HTML rendering of the wiki:
 You will also need a webserver to serve the content in the `destdir`
 defined above. We assume you will configure a virtual host named `mirror.example.com`. Here are some examples on how to do those, see [[!iki setup]] and [[!iki tips/dot_cgi]] for complete documentation.
 
 You will also need a webserver to serve the content in the `destdir`
 defined above. We assume you will configure a virtual host named `mirror.example.com`. Here are some examples on how to do those, see [[!iki setup]] and [[!iki tips/dot_cgi]] for complete documentation.
 

-Note that this will also configure CGI so that people can edit the wiki. Note that this configuration may involve timeouts if the main site is down.
+Note that this will also configure CGI so that people can edit the wiki. Note that this configuration may involve timeouts if the main site is down, as ikiwiki will attempt to push to the central git repository at every change.

 
 #### Apache configuration
 
 
 #### Apache configuration
 


@@ -188,20 +156,33 @@ Make this writable:
 
     chmod a+w /tmp/fcgi.socket
 
 
     chmod a+w /tmp/fcgi.socket
 

-### Read-only mirror: done!
+### Enable the pinger functionality

 
 

-At this point, you are done! You can edit your own clone of the wiki, although your changes will not go back to the main site. However, you can always push or pull manually from the `repository` in `~user/source.git` to update the main site.
+At this point, you need to enable the pinger functionality to make sure that changes on the central server propagate to your mirror.

 
 

-### Announcing the mirror
+This assumes a central wiki that exposes its git
+repository and has the [[plugins/pinger]] plugin enabled. Enable the
+[[plugins/pingee]] plugin in your configuration, and edit the origin wiki,
+adding a ping directive for your mirror:

 
 

-Once your mirror works, you can also add it to the list of mirrors. You can ask the mirror where you take it from (and why not, all mirrors) to add it to their setup file. As an example, here's the configuration for the first mirror:
+       \[[!ping from="http://thewiki.com/"
+       to="http://mymirror.com/ikiwiki.cgi?do=ping"]]

 
 

-    mirrorlist:
-      example: https://wiki.example.com/
+The "from" parameter needs to be the url to the origin wiki. The "to" parameter
+is the url to ping on your mirror. This can be done basically in any page.

 
 

-The [[plugins/mirrorlist]] plugin of course needs to be enabled for this to work.
+Now whenever the main wiki is edited, it will ping your mirror, which will
+pull the changes from "origin" using git, and update itself. It could, in
+turn ping another mirror, etc.

 
 

-### Alternative configuration
+And if someone edits a page on your mirror, it will "git push origin",
+committing the changes back to the origin git repository, and updating the
+origin mirror. Assuming you can push to that git repository. If you can't,
+and you want a mirror, and not a branch, you should disable web edits on
+your mirror. (You could also point the cgiurl for your mirror at the origin
+wiki if you do not want to incur that overhead or do not want to, or can't, run a CGI.)
+
+### Fully decentralized configuration

 
 In the above configuration, the master git repository is still on the main site. If that site goes down, there will be delays when editing the wiki mirror. It could also simply fail because it will not be able to push the changes to the master git repo. An alternative is to setup a local bare repository that is synced with the master.
 
 
 In the above configuration, the master git repository is still on the main site. If that site goes down, there will be delays when editing the wiki mirror. It could also simply fail because it will not be able to push the changes to the master git repo. An alternative is to setup a local bare repository that is synced with the master.
 


@@ -222,17 +203,44 @@ The following entries will be different from the above setup file:
     git_wrapper: /home/user/source.git/hooks/post-commit
     git_test_receive_wrapper: /home/user/source.git/hooks/pre-receive
 
     git_wrapper: /home/user/source.git/hooks/post-commit
     git_test_receive_wrapper: /home/user/source.git/hooks/pre-receive
 

-To do this, the mirror needs to push back to the master, again using the gitpush plugin:
+To do this, the mirror needs to push back to the master, using the [[plugins/contrib/gitpush]] plugin:

 
     git_push_to:
     - git://wiki.example.com/
 
 This will ensure that commits done on the mirror will propagate back to the master.
 
 
     git_push_to:
     - git://wiki.example.com/
 
 This will ensure that commits done on the mirror will propagate back to the master.
 

-### Other guides
+## Other ideas
+
+See also:

 
 

-Another guide is the [[tips/laptop_wiki_with_git]] guide. To get a
-better understanding of how ikiwiki works, see [[rcs/git]].
+ * [[setup]]
+ * [[setup/byhand]]
+ * [[rcs/git]]
+ * [[tips/laptop_wiki_with_git]]
+ * [ikiwiki creation notes](http://piny.be/jrayhawk/notes/ikiwiki_creation/)

 
 

-[This](http://piny.be/jrayhawk/notes/ikiwiki_creation/) may also be of
-use if the above doesn't work.
+### Announcing the mirror
+
+Once your mirror works, you can also add it to the list of mirrors. You can ask the mirror where you take it from (and why not, all mirrors) to add it to their setup file. As an example, here's the configuration for the first mirror:
+
+    mirrorlist:
+      example: https://wiki.example.com/
+
+The [[plugins/mirrorlist]] plugin of course needs to be enabled for this to work.
+
+### branching a wiki
+
+It follows that setting up a branch of a wiki is just like the fully decentralised mirror above, except
+we don't want it to push changes back to the origin. The easy way to
+accomplish this is to clone the origin git repository using a readonly
+protocol (ie, "git://"). Then you can't push to it.
+
+If a page on your branch is modified and other modifications are made to
+the same page in the origin, a conflict might occur when that change is
+pulled in. How well will this be dealt with and how to resolve it? I think
+that the conflict markers will just appear on the page as it's rendered in
+the wiki, and if you could even resolve the conflict using the web
+interface. Not 100% sure as I've not gotten into this situation yet.
+
+--[[Joey]]