diff options
| -rw-r--r-- | IkiWiki/CGI.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/plugins/amazon_s3.mdwn | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index f8617bfc6..cb4f395a0 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -79,7 +79,7 @@ sub cgitemplate ($$$;@) { title => $title, wikiname => $config{wikiname}, content => $content, - baseurl => urlabs(urlto(""), $topurl), + baseurl => urlabs(baseurl(), $topurl), html5 => $config{html5}, %params, ); diff --git a/debian/changelog b/debian/changelog index c2243572c..582971470 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (3.20110125) UNRELEASED; urgency=low * recentchanges: Use transient underlay (smcv) * map: Avoid unnecessary ul's in maps with nested directories. (Giuseppe Bilotta) + * Fix broken baseurl in cgi mode when usedirs is disabled. Bug introduced + in 3.20101231. -- Joey Hess <joeyh@debian.org> Tue, 01 Feb 2011 21:00:57 -0400 diff --git a/doc/plugins/amazon_s3.mdwn b/doc/plugins/amazon_s3.mdwn index 331dc4acf..7fe60cb8d 100644 --- a/doc/plugins/amazon_s3.mdwn +++ b/doc/plugins/amazon_s3.mdwn @@ -22,9 +22,10 @@ This plugin uses the following settings in the setup file: set it to "foo", then the url will be "http://foo.s3.amazonaws.com/wiki/". * `amazon_s3_prefix` - A prefix to prepend to each page name. - The default is "wiki/". Note that due to S3 limitations (lack of support - for uploading a root key), it is not possible to set the prefix to an - empty string. + The default is "wiki/". Note: In order to host your site at the root, + it needs to be set to "", and you'll have to + [read this](http://aws.typepad.com/aws/2011/02/host-your-static-website-on-amazon-s3.html) + for details about configuring your S3 bucket as a website. * `amazon_s3_location` - Optionally, this can be set to control which datacenter to use. For example, set it to "EU" to for Europe. * `amazon_s3_dupindex` - Normally, when `usedirs` is enabled, @@ -33,7 +34,8 @@ This plugin uses the following settings in the setup file: "index.html" in their names to work, you can enable this option. Then each index.html file will be stored in S3 *twice*, under both names. This will use more disk and bandwidth, and is not recommended unless you really - need it for some reason. + need it for some reason. These days, it's probably better to configure + your S3 bucket as a website. Note that you should still set `destdir` in the setup file. The files that are uploaded to Amazon S3 will still be written to the destdir, too. |