aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-19 19:55:28 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-19 19:55:28 -0400
commit3bdc66d30045a7259a7a71173fc6ce85b17cfaf6 (patch)
treee243621b2a2678ed4350dce85d733dab9bf60c53 /doc
parentdb146d9f1e70b69b13b02b7484027b288de5decf (diff)
parent991c1b096b3f21e99352e43e6c2615df9dae1331 (diff)
downloadikiwiki-3bdc66d30045a7259a7a71173fc6ce85b17cfaf6.tar
ikiwiki-3bdc66d30045a7259a7a71173fc6ce85b17cfaf6.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
-rw-r--r--doc/tips/Git_repository_and_web_server_on_different_hosts.mdwn4
1 files changed, 2 insertions, 2 deletions
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 eb1583b08..58940b89f 100644
--- 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_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
==========