From: Joey Hess Date: Sun, 3 Jun 2012 17:17:03 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20120629~47 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6622d913dd0ca91f35eae1c9ca1e5b764112514f?hp=33f84ca3a35ac10e229cdb132f4fed90af41b049 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm index f54d94ad5..b7e532485 100644 --- a/IkiWiki/Plugin/mirrorlist.pm +++ b/IkiWiki/Plugin/mirrorlist.pm @@ -24,6 +24,19 @@ sub getsetup () { safe => 1, rebuild => 1, }, + mirrorlist_use_cgi => { + type => 'boolean', + example => 1, + description => "generate links that point to the mirrors' ikiwiki CGI", + safe => 1, + rebuild => 1, + }, +} + +sub checkconfig () { + if (! defined $config{mirrorlist_use_cgi}) { + $config{mirrorlist_use_cgi}=0; + } } sub pagetemplate (@) { @@ -46,7 +59,9 @@ sub mirrorlist ($) { join(", ", map { qq{{$_}."?do=goto&page=$page" : + $config{mirrorlist}->{$_}."/".urlto($page, "") ). qq{">$_} } keys %{$config{mirrorlist}} ). diff --git a/debian/changelog b/debian/changelog index 9a73f1084..da2cc73bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20120517) UNRELEASED; urgency=low + + * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or + other config differences by linking to the mirror's CGI. (intrigeri) + + -- Joey Hess Sun, 03 Jun 2012 13:15:22 -0400 + ikiwiki (3.20120516) unstable; urgency=high * meta: Security fix; add missing sanitization of author and authorurl. diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn index aedc1f4a0..b63685813 100644 --- a/doc/plugins/mirrorlist.mdwn +++ b/doc/plugins/mirrorlist.mdwn @@ -5,3 +5,18 @@ This plugin allows adding links a list of mirrors to each page in the wiki. For each mirror, a name and an url should be specified. Pages are assumed to exist in the same location under the specified url on each mirror. + +In case the `usedirs` setting is not the same on all your mirrors, or +if it is not the same on your local wiki as on the mirror a +possibility is to let each mirror's ikiwiki CGI find out the correct +target page url themselves; in that case the mirrors urls must be set +to their ikiwiki CGI url instead of their base url. Example: + + mirrorlist_use_cgi => 1, + mirrorlist => { + 'mirror1' => 'https://mirror.example.org/ikiwiki.cgi', + 'mirror2' => 'https://mirror2.example.org/ikiwiki.cgi', + }, + +The mirrors must have the ikiwiki CGI and the [[goto]] plugin enabled +for this to work. diff --git a/doc/security.mdwn b/doc/security.mdwn index d72382672..c3b62cd3c 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -484,10 +484,10 @@ for information disclosure via symlinks. ([[!cve CVE-2011-1408]]) This hole was discovered on 8 June 2011 and fixed the same day with the release of ikiwiki 3.20110608. Note that the fix is dependant on -a version of su that has a similar hole fixed; [[!debbug 628843]] -tracks fixing the hole in Debian's su. An upgrade is a must for any -sites that have `ikiwiki-update-wikilist` installed suid (not the default), -and whose admins run `ikiwiki-mass-rebuild`. +a version of su that has a similar hole fixed. Version 4.1.5 of the shadow +package contains the fixed su; [[!debbug 628843]] tracks fixing the hole in +Debian. An upgrade is a must for any sites that have `ikiwiki-update-wikilist` +installed suid (not the default), and whose admins run `ikiwiki-mass-rebuild`. ## javascript insertion via meta tags diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn index ca9cb532c..5701d8e2b 100644 --- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -99,3 +99,5 @@ and decided this time it was really needed to implement this feature. >>>>>> this should not block the merge of the branch I have been >>>>>> proposing. Support for the usecase you are suggesting can >>>>>> always be added later if needed. --[[intrigeri]] + +>>>>>>> Well, that came out nice and clean. [[done]] --[[Joey]] diff --git a/doc/todo/wikiwyg.mdwn b/doc/todo/wikiwyg.mdwn index 42bd6d548..602a1b436 100644 --- a/doc/todo/wikiwyg.mdwn +++ b/doc/todo/wikiwyg.mdwn @@ -66,3 +66,6 @@ The plugin can be downloaded from >> Seems the new place is now at Github: >> FYI >> --[[users/Olea]] + +>>> No, that's the wikiwyg source, not the ikiwiki plugin to use it. The +>>> latter is what's lost. --[[Joey]]