From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Sep 2014 20:41:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'spalax/paternal/upload-svg'
X-Git-Tag: 3.20140916~48
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cf3e3c5a8849dcf7f43d055bb9555e088651bae4?hp=-c

Merge remote-tracking branch 'spalax/paternal/upload-svg'
---

cf3e3c5a8849dcf7f43d055bb9555e088651bae4
diff --combined doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
index 6bbaf3e6e,d63409700..e6277d338
--- 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
@@@ -17,7 -17,6 +17,7 @@@ I assume the [[rcs]] used is [[rcs/git]
  
  # Similar and related tips and problems
  
 +- [[tips/distributed_wikis]] References different way of distributing wikis (including this one).
  - [[http://www.icanttype.org/blog/ikiwiki_git_remote_repo/]] Similar to what I
    am describing, excepted that you must be able to connect to the machine
    hosting Ikiwiki using ssh.
@@@ -38,6 -37,8 +38,8 @@@ it on a remote machine, and tell Ikiwik
  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*.
@@@ -144,12 -145,14 +146,12 @@@ the IkiWiki machine, and here is the de
  ## Going further
  
  - *Web server on a third machine* It should be possible to use a third machine
 -  to host the web server. A hook might be used to export the rendered wiki on
 -  this server, or use a nfs repository as the destination repository of
 -  ikiwiki. However, allowing web modifications (using CGI) might be tricky…
 +  to host the web server, using [[this documentation|tips/Git_repository_and_web_server_on_different_hosts/]].
  - *Using [[gitolite|https://github.com/sitaramc/gitolite]] to manage
    repositories on the git machine* Simply replace the manipulations of git on
    the git machine by the corresponding manipulations using gitolite.
      * With gitolite, you can use this line in a `post-update` hook:
  
 -        `[ x"$GL_USER" = x"`*`gitolite-user`*`" ] || wget ...`
 +        `[ x"$GL_USER" = x"`*`gitolite-user`*`" ] || wget ...` where *gitolite-user* is the name of the public key registered through gitolite.
  
 -        thus, you filter out precisely the events that originate from the server-to-be-pinged, no matter what the commit id says. (For example, if you push commits you created on a local CGI ikiwiki, they'd be called '@web' as well).
 +        Thus, you filter out precisely the events that originate from the server-to-be-pinged, no matter what the commit id says. (For example, if you push commits you created on a local CGI ikiwiki, they'd be called '@web' as well).