Merge branch 'ready/templatebody'

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

diff --git a/doc/tips/Git_repository_and_web_server_on_different_hosts.mdwn b/doc/tips/Git_repository_and_web_server_on_different_hosts.mdwn
index 20c6cf1d30e743ec59d1bc2e204031ecf0b0dba0..c1529c7a0272eae6fd777081daad6056d4d44832 100644 (file)
--- a/doc/tips/Git_repository_and_web_server_on_different_hosts.mdwn
+++ b/doc/tips/Git_repository_and_web_server_on_different_hosts.mdwn
@@ -1,8 +1,10 @@
-One may want to provide ikiwiki hosting with git+ssh access and web
+One may want to provide ikiwiki hosting with [[rcs/git]]+ssh access and web
 server located at different hosts. Here's a description for such
 a setup, using password-less SSH as a way of communication between
 these two hosts.
 
+[[!img separate-webserver.svg size=490x align=right]]
+
 Git server
 ==========
 
@@ -22,14 +24,14 @@ in `~ikiwki_example/ikiwiki_example.git/hooks/post-update`, is
 executable and contains:
 
        #!/bin/sh
-       /usr/bin/ssh ikiwiki_amnesia@www bin/ikiwiki.update
+       /usr/bin/ssh ikiwiki_example@webserver bin/ikiwiki.update
 
 Password-less SSH must be setup to make this possible; one can
 restrict `gitserver:ikiwiki_example` to be able to run only the needed
 command on the web server, using such a line in
 `webserver:~ikiwiki_example/.ssh/authorized_keys`:
 
-       command="bin/ikiwiki.update",from="vcs.example.com",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa ...
+       command="bin/ikiwiki.update",from="gitserver.example.com",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa ...
 
 Web server
 ==========