aboutsummaryrefslogtreecommitdiff
path: root/doc/tips
diff options
context:
space:
mode:
authorAntoine Beaupré <anarcat@koumbit.org>2013-11-26 00:15:52 -0500
committerAntoine Beaupré <anarcat@koumbit.org>2013-11-26 00:15:52 -0500
commitc44d59a5f6a62953f2ab5eb33d00b91cbae429d1 (patch)
tree55cce644899e065f7f19fd96d1a1fed8f85b2d76 /doc/tips
parent9a008cc243cfa0dc98d1590614e80f0f42e91e4d (diff)
downloadikiwiki-c44d59a5f6a62953f2ab5eb33d00b91cbae429d1.tar
ikiwiki-c44d59a5f6a62953f2ab5eb33d00b91cbae429d1.tar.gz
make dot_cgi clearly optional
Diffstat (limited to 'doc/tips')
-rw-r--r--doc/tips/laptop_wiki_with_git.mdwn17
1 files changed, 11 insertions, 6 deletions
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