Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.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 7fb883b1090c58539e6aa33e12ca6810501893f2..58940b89f9ef860b9a5cc3f2c15337bf036ad6fc 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
@@ -22,14 +22,14 @@ in `~ikiwki_example/ikiwiki_example.git/hooks/post-update`, is
 executable and contains:
 
        #!/bin/sh
-       /usr/bin/ssh ikiwiki_example@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
 ==========