diff options
| -rw-r--r-- | IkiWiki.pm | 4 | ||||
| -rw-r--r-- | debian/NEWS | 18 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | doc/ikiwiki.setup | 8 | ||||
| -rw-r--r-- | doc/plugins.mdwn | 2 | ||||
| -rw-r--r-- | doc/plugins/openid.mdwn | 5 |
7 files changed, 33 insertions, 12 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 70fc6ff73..1d764bae2 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -69,14 +69,14 @@ sub defaultconfig () { #{{{ setup => undef, adminuser => undef, adminemail => undef, - plugin => [qw{mdwn inline htmlscrubber passwordauth signinedit + plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit lockedit conditional}], timeformat => '%c', locale => undef, sslcookie => 0, httpauth => 0, userdir => "", - usedirs => 0, + usedirs => 1, numbacklinks => 10, } #}}} diff --git a/debian/NEWS b/debian/NEWS index dc7a45960..b24196732 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,21 @@ +ikiwiki (2.00) unstable; urgency=low + + With the 2.0 release of ikiwiki, some major changes have been made to the + default configuration: + + * The 'usedirs' setting is enabled by default. This *will* break all URLs + to wikis that did not have 'usedirs' turned on before, unless you follow + the procedure described at <http://ikiwiki.info/tips/switching_to_usedirs>, + or edit your setup file to turn usedirs off: + usedirs => 0, + + * OpenID logins are now enabled by default. So ikiwiki now depends on the + Net::OpenID::Consumer perl module. Password logins are also still on by + default. If you like, you can turn either OpenID or password logins off + via the 'disable_plugins' setting. + + -- Joey Hess <joeyh@debian.org> Sun, 29 Apr 2007 19:00:43 -0400 + ikiwiki (1.51) unstable; urgency=low Some wikis need to be rebuilt on upgrade to this version, due to changes to diff --git a/debian/changelog b/debian/changelog index 37e7e28b0..c1e0626c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ ikiwiki (1.52) UNRELEASED; urgency=low Especially cleans up the ordering of the admin's preferences form. * Use a fieldset to set off the openid entry from the rest of the login form. + * Enable openid logins by default. + * Enable usedirs by default. - -- Joey Hess <joeyh@debian.org> Sun, 29 Apr 2007 18:47:00 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 29 Apr 2007 19:00:15 -0400 ikiwiki (1.51) unstable; urgency=low diff --git a/debian/control b/debian/control index 72100d8c1..187e70567 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ XS-Vcs-Browser: http://ikiwiki.info/cgi-bin/viewvc.cgi/trunk/?root=ikiwiki Package: ikiwiki Architecture: all -Depends: ${perl:Depends}, libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.02.02), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, gcc | c-compiler, libc6-dev | libc-dev, libhtml-parser-perl, liburi-perl -Recommends: subversion | git-core | tla | mercurial, hyperestraier, libnet-openid-consumer-perl +Depends: ${perl:Depends}, libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.02.02), libtime-duration-perl, libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl | libnet-openid-consumer-perl, gcc | c-compiler, libc6-dev | libc-dev, libhtml-parser-perl, liburi-perl +Recommends: subversion | git-core | tla | mercurial, hyperestraier Suggests: viewvc | viewcvs, librpc-xml-perl, libtext-wikiformat-perl, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index d54527eca..d498e8dfa 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -97,14 +97,14 @@ use IkiWiki::Setup::Standard { syslog => 0, # To link to user pages in a subdirectory of the wiki. #userdir => "users", - # To create output files named page/index.html rather than page.html. - #usedirs => 1, + # To create output files named page.html rather than page/index.html. + #usedirs => 0, # To add plugins, list them here. - #add_plugins => [qw{goodstuff openid search wikitext camelcase + #add_plugins => [qw{goodstuff search wikitext camelcase # htmltidy fortune sidebar map rst anonok}], # If you want to disable any of the default plugins, list them here. - #disable_plugins => [qw{inline htmlscrubber passwordauth}], + #disable_plugins => [qw{inline htmlscrubber passwordauth openid}], # For use with the tag plugin, make all tags be located under a # base page. diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn index 39f0d0209..6ee2f3a69 100644 --- a/doc/plugins.mdwn +++ b/doc/plugins.mdwn @@ -7,7 +7,7 @@ wiki, or just have [[type/fun]]. There's documentation if you want to [[write]] your own plugins, or you can install and use plugins [[contributed|contrib]] by others. -The [[mdwn]], [[inline]], [[htmlscrubber]], [[passwordauth]], +The [[mdwn]], [[inline]], [[htmlscrubber]], [[passwordauth]], [[openid]], [[signinedit]], [[lockedit]], and [[conditional]] plugins are enabled by default. To enable other plugins, use the `--plugin` switch described in [[usage]], or the equivalent `add_plugins` line in [[ikiwiki.setup]]. diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn index 94929e7ab..a85727eca 100644 --- a/doc/plugins/openid.mdwn +++ b/doc/plugins/openid.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=openid author="[[Joey]]"]] +[[template id=plugin name=openid core=1 author="[[Joey]]"]] [[tag type/auth]] This plugin allows users to use their [OpenID](http://openid.net/) to log @@ -21,4 +21,5 @@ login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the affiliate is created, set `openidsignup` to point to the affiliate's signup url. -This plugin is included in ikiwiki, but is not enabled by default. +This plugin is enabled by default, but can be turned off if you want to +only use some other form of authentication, such as [[passwordauth]]. |