summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-11 00:27:45 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-11 00:27:45 +0200
commit665db7a4af7e86d6202f0295cbc3a8b12708ca00 (patch)
tree3fae33b94b77a69fb2c17fb8ab890277189d3e01
parent77dac4f4ee1ef0ab462f93c9bc6d60d37189ef63 (diff)
parent63c1477123651ccaac5a817992578ae37094d953 (diff)
Merge branch 'nonedit' into allinone
-rw-r--r--ikiwiki_admin.setup4
1 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki_admin.setup b/ikiwiki_admin.setup
index 16e0ee8..88ba4ae 100644
--- a/ikiwiki_admin.setup
+++ b/ikiwiki_admin.setup
@@ -12,7 +12,7 @@ use IkiWiki::Setup::Standard {
# Be sure to customise these..
srcdir => $ENV{'HOME'} . "/private_webdata/examplewiki/content",
- destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org/wiki",
+ destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org",
url => "http://wiki.example.org",
cgiurl => "http://wiki.example.org/ikiwiki.cgi",
@@ -82,7 +82,7 @@ use IkiWiki::Setup::Standard {
# # Note that this will overwrite any existing
# # post-update hook script, which may not be
# # what you want.
- # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki",
+ # wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-admin",
# wrappermode => "06755",
#},
#{