From c44d59a5f6a62953f2ab5eb33d00b91cbae429d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 26 Nov 2013 00:15:52 -0500 Subject: make dot_cgi clearly optional --- doc/tips/laptop_wiki_with_git.mdwn | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'doc/tips/laptop_wiki_with_git.mdwn') diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn index 930a0ae69..4011763fc 100644 --- a/doc/tips/laptop_wiki_with_git.mdwn +++ b/doc/tips/laptop_wiki_with_git.mdwn @@ -19,9 +19,6 @@ for setting up ikiwiki with git. Next, `git clone` the source (`$REPOSITORY`, not `$SRCDIR`) from the server to the laptop. -Now, set up a [[web_server|dot_cgi]] on your laptop, if it doesn't -already have one. - Now you need to write a setup file for ikiwiki on the laptop. Mostly this is standard, but a few special settings are needed: @@ -54,15 +51,23 @@ on your laptop, a few examples: destdir: /home/user/public_html # optional url: http://foo-wiki.localhost - # disable CGI, unless you want to get really funky - cgiurl: - cgi_wrapper: libdir: /home/user/foo-wiki/.ikiwiki ENV: TMPDIR: /home/user/tmp cookiejar: file: +Now, set up a [[web_server|dot_cgi]] on your laptop, if it doesn't +already have one. You can also skip that step if you want only to +render the wiki and not allow edition, in which case you'll want the +following: + + # disable CGI, unless you want to get really funky + cgiurl: + cgi_wrapper: + +You can also direct people to the main server for web edition there. + Use standard git commands to handle pulling from and pushing to the server. Note that if changes are pulled from the server, you will need to manually -- cgit v1.2.3