underlay_install:
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
- for dir in `cd underlays && $(FIND) . -follow -type d ! -regex '.*\.svn.*'`; do \
+ for dir in `cd underlays && $(FIND) . -follow -type d`; do \
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f`; do \
cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
extra_install: underlay_install
# Install example sites.
- for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*\.svn.*'`; do \
+ for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
done
- for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*\.svn.*'`; do \
+ for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
done
- for dir in `$(FIND) templates -follow -type d ! -regex '.*\.svn.*'`; do \
+ for dir in `$(FIND) templates -follow -type d`; do \
install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
for file in `$(FIND) $$dir -follow -maxdepth 1 -type f`; do \
install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
--- /dev/null
+When I try to clone or pull the ikiwiki repo via the http interface described on the [[git]] page,
+I get the following error message:
+
+ fatal: http://git.ikiwiki.info/ikiwiki.git/info/refs not found: did you run git update-server-info on the server?
+
+Using the "git" interface still works, but I can't access that through a firewall.
+
+Also, clicking on the "gitweb" link gets me to the front page of ikiwiki.info, not the gitweb page.
+
+-- [[KathrynAndersen]]
+
+> I've updated the gitweb link. Now that ikiwiki's wiki is managed by
+> ikiwiki-hosting, [this bug](http://ikiwiki-hosting.branchable.com/todo/readonly_git-http-backend/)
+> needs to be fixed there before git http can be used. In the meantime,
+> the github mirror does provide it: <http://github.com/joeyh/ikiwiki.git>
+> --[[Joey]] [[!tag done]]
+
+>> Thanks. -- [[KathrynAndersen]]
> Does seem easier to repro than I thought.
> Ok, fixed it.. [[bugs/done]] --[[Joey]]
+
+Hmmmmm, looks like it is not entirely fixed. I am getting it on my own
+[blog](http://blog.tobez.org/). Just upgraded to 3.20110430, same same.
+I am using custom openid with redirection to myopenid.com.
+Please tell me if you need more info. The same openid worked fine to login to *this* site to post this.
+-- Anton
+
+> Well, this bug is from 2007. Probably you are not encountering the same
+> bug.
+>
+> I also have a openid delegation to myopenid, and I can reproduce the
+> problem when logging into your site.
+>
+> What version of the
+> Net::OpenId::Consumer perl library do you have installed? --[[Joey]]
Did not hear back, so calling this [[done]], unless I hear differently.
--[[Joey]]
+
+Just in case someone else sees this same error message:
+I was able to reproduce this by having an incomplete (not upgraded) rcs backend that didn't provide rcs_commit_staged() when attempting to submit a blog comment.
+--[[JeremyReed]]
--- /dev/null
+The [[plugins/opendiscussion]] plugin allows pages named according to
+the `discussionpage` setting to be edited anonymously, even if
+`discussion => 0` is set.
+
+(If it respected the `discussion` option, the combination of
+`opendiscussion` and `moderatedcomments` might be good for blogs.)
--- /dev/null
+On some source .html pages, po4a wrongly detects a malformed document,
+which makes the po plugin error out and the wiki build is aborted.
+
+I've pushed a [[patch]] to my `po` branch to fix this: it makes po4a
+warn, instead of error'ing out, when it detects a malformed input
+document.
+
+This is really a po4a bug which I will report, but since most ikiwiki
+users are gonna live with Squeeze's po4a for a while, I think we
+should workaround it in ikiwiki.
+
+Also, the current state of things makes it a bit too easy to break a
+given ikiwiki site build (DoS) when both the html and po plugins are
+enabled: inserting a html tag without closing it is enough.
+
+--[[intrigeri]]
--- /dev/null
+##How to remove the postform for my blog from front page?
+
+I have an inline to create a blog on the front page of my site. I don't want any visitors to see that form nor attempt to click "Edit" on it. I tried setting postform="no" but I did not notice any change.
+
+Any suggestions on how I can have a private webpage that offers the blog post form ("Add a new post titled:") and also turn off that form from my front page but still keep the blog articles displayed from the front page?
+
+I looked at the "inline" docs but may have overlooked this.
+
+I do see I can disable the editpage plugin to remove from front page. But then that made it so I can't add a new blog posting (I want to just not from the front page).
+
+-- [[JeremyReed]]
+
+> You need two separate inlines, one on your front page which can be as simple as `\[[!inline pages="blog/*"]]`, and another on a hidden/unadvertised page, which has `postform=yes` added, that you will use to add posts. Removing the 'Edit' link from the front page (and all other pages — presumably you don't want it on blog post pages either) can be achieved in a number of ways. I do it by removing it from my `page.tmpl` file (point `templatedir` in your setup file to a directory under your control; copy `/usr/share/ikiwiki/templates/page.tmpl` into it, and remember that every time ikiwiki is upgraded, potentially the file has changed, and you might need to merge in the changes). A better way might be to hide the link via CSS (`.actions { display: none; }`). You can't add pages via the web interface if you remove [[plugins/editpage]] from your setup. You should look at [[plugins/lockedit]] to make sure that only you can edit pages/submit blog posts, should anyone else stumble across your unadvertised "submit blog post" page. — [[Jon]]
--- /dev/null
+I just tried to lock some pages via the [[plugins/lockedit]] plugin in my wiki but it does not work. Not any page I've tried gets locked. Here's a snipped of my setup:
+
+ add_plugins => [qw{goodstuff edittemplate filecheck getsource htmltidy recentchanges relativedate rename remove search sidebar po httpauth attachment img 404 inline localstyle pagestats progress orphans map toc brokenlinks autoindex anonok blogspam recentchangesdiff}],
+ disable_plugins => [qw{smiley openid theme}],
+ [...]
+ anonok_pagespec => '*',
+ [...]
+ locked_pages => 'todo and todo/done and index and ikiwiki/*',
+
+Is there an interference between anonok and lockedit or is there just a typo?
+
+I can't imagine another source of the problem. Hope you can help me. --[[bacuh]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2011-05-26T09:38:12Z"
+ content="""
+[[plugins/anonok]] might take precedence over [[plugins/lockedit]] (it depends
+which gets loaded first). You should change `anonok_pagespec` to not cover the
+`locked_pages`.
+
+(It might be better if [[plugins/lockedit]] always applied first, though;
+except then it'd interfere with [[plugins/opendiscussion]], so maybe
+[[plugins/opendiscussion]] should apply first of all...)
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://xlogon.net/bacuh"
+ ip="93.182.181.39"
+ subject="comment 2"
+ date="2011-05-26T10:56:28Z"
+ content="""
+Thanks a lot. Negating locked_pages in anonok_pagespec works.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://xlogon.net/bacuh"
+ ip="93.182.181.39"
+ subject="comment 3"
+ date="2011-05-26T11:07:08Z"
+ content="""
+Ooops, that was wrong.
+
+It is just not possible to edit those pages anonymously. Lockedit still doesn't work.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 4"
+ date="2011-05-26T15:08:10Z"
+ content="""
+ locked_pages => 'todo and todo/done and index and ikiwiki/*',
+
+I didn't spot it before, but this is wrong: you want \"or\"
+instead of \"and\".
+
+It's a condition under which pages are to be locked: you're trying
+to lock all pages that are simultaneously todo, todo/done and some
+other names, which is an impossible condition to satisfy, so nothing
+is locked!
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://xlogon.net/bacuh"
+ ip="93.182.181.39"
+ subject="comment 5"
+ date="2011-05-27T11:07:27Z"
+ content="""
+Obvious! Should have realized that.
+
+May this help other people.
+"""]]
--- /dev/null
+The [[plugins/404]] plugin is not working with nginx here:
+
+ Error: "do" parameter missing
+
+If i use the [[shell script for lighttpd|bugs/404_plugin_and_lighttpd]], ikiwiki answers
+
+ Error: missing page parameter
+
+Might this be a mistake by me or does anyone know a workaround to get the 404 plugin working with nginx? --[[bacuh]]
+
+
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2011-05-26T06:58:04Z"
+ content="""
+The 404 plugin relies on environment variables set by Apache for 404 handlers. Not all web servers set the same variables (404 handlers aren't a standard feature) so it might need adapting to support nginx. (lighttpd has a similer problem - it doesn't indicate that the request was a 404 in an obvious way.)
+
+If you temporarily set this (shell!) CGI script as your 404 handler, its output should indicate what variables nginx sets:
+
+ #!/bin/sh
+ printf \"Content-type: text/plain\r\n\r\n\"
+ env
+
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://xlogon.net/bacuh"
+ ip="93.182.181.39"
+ subject="comment 2"
+ date="2011-05-26T10:48:12Z"
+ content="""
+I checked the script's output and some nginx documentation. The only variable I could not find is $REDIRECT_URL. Also I could not discover any equivalent. Trying to define the variable myself in nginx's config does not help out.
+
+Any ideas?
+(Should I provide env?)
+"""]]
--- /dev/null
+I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See <https://github.com/profjim/pandoc-iki> for details.
+
+How do I get this added to the contrib section of the plugin list? --Profjim
+
+
git clone git://git.ikiwiki.info/
-Or like this if your firewall only passes http traffic (slow):
-
- git clone http://git.ikiwiki.info/ikiwiki.git/
-
-The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki).
+The gitweb is [here](http://source.ikiwiki.branchable.com/?p=source.git;a=summary).
Commits to this git repository are fed into [CIA](http://cia.vc), and can
be browsed, subscribed to etc on its
* github `git://github.com/joeyh/ikiwiki.git`
([browse](http://github.com/joeyh/ikiwiki/tree/master))
- A mirror of the main repo, automatically updated.
+ A mirror of the main repo, automatically updated. Also provides http
+ cloning at `http://github.com/joeyh/ikiwiki.git`
* l10n `git://l10n.ikiwiki.info/`
Open push localization branch used for <http://l10n.ikiwiki.info/>
* [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
* [Richard "RichiH" Hartmann](http://richardhartmann.de/blog) - I thought I had added myself a year ago. Oups :)
* [Jonas Smedegaard](http://dr.jones.dk/) multilingual "classic" website w/ blog
* [Siri Reiter](http://sirireiter.dk/) portfolio website with a blog (in danish)
+* [L'Altro Wiki](http://laltromondo.dynalias.net/~iki/) Tutorials, reviews, miscellaneus articles in English and Italian, from the IRC network syrolnet.org
--- /dev/null
+## How to only have editpage link when admin is logged in? Or on secret page?
+
+I saw [[todo/Allow_disabling_edit_and_preferences_links]] but not sure if that is what I want.
+
+I want to have edit links to maintain site. (I am currently manually using vi and cvs on server or pasting in ikiwiki.cgi to browser location bar.) But I do not want the regular (non-admin) visitors to see the edit link.
+
+Any suggestions?
+
+Can two different websites be regenerated at the same time? Or is there any CSS or other template magic I can use to selectively show the EDITURL?
+
+I do have a secret page that I use to add new blog entry (postform).
+
+-- [[JeremyReed]]
+
+> You can have two different sites if you want, and perhaps push from
+> the "edit" site to the main site. See [[tips/laptop_wiki_with_git]] for example.
+>
+> There has been talk about finding a way to hide the edit links from
+> users who are not logged in sufficiently to be able to edit, using
+> javascript, but nothing yet.
+>
+> Ikiwiki puts x-wiki headers on pages, and these can be used by
+> plugins at <http://universaleditbutton.org/Universal_Edit_Button>,
+> then you can disable the edit links. --[[Joey]]
--- /dev/null
+To change favicon you need edit lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/favicon.pm and change line:
+> $template->param(favicon => "favicon.ico");
+
+at the end of file. And rebuild wiki:
+> ikiwiki -setup your_wiki_config
+
+After reload page you'll see your new favicon.
+
+That method allow configure Animated PNG even:
+> ikiwiki.sphynkx.org.ua
+
+----
+Sphynkx
+
+> Typically sites that use animated pngs (ugh!) as favicons just call it
+> `favicon.ico`. It's not as if (most) web servers and browsers trust
+> the filename extension to mean anything anyway. And using favicon.ico
+> makes it more likely to work with old browsers that just always look for
+> that. --[[Joey]]
This plugin allows editing of Discussion pages, and posting of comments,
even when the [[lockedit]] plugin has been configured to otherwise prevent
editing.
+
+Like the [[plugins/anonok]] plugin, this plugin allows anonymous edits
+and comments, so be prepared to deal with comment spam;
+the [[plugins/moderatedcomments]] and [[plugins/blogspam]] plugins might
+be useful to reduce this.
This is implemented in my po branch, please review. --[[intrigeri]]
[[!tag patch]]
+
+> This has been merged for a while => [[done]].
I think [mathjax](http://www.mathjax.org/) would be the best option. This is the math rendering engine used in mathoverflow.
+> I've updated Jason Blevin's pandoc plugin to permit tighter integration between Ikiwiki and Pandoc. Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. Both jsMath and MathJaX are supported, along with many other methods. See https://github.com/profjim/pandoc-iki for details. --Profjim
+
[[!tag wishlist]]
>> I've [[updated|mdwn_itex]] Jason's plugin for ikiwiki 3.x. --[[wtk]]
+>>> I've updated [[Jason's pandoc plugin|users/jasonblevins]] to permit the TeX processing to be managed via Pandoc. See <https://github.com/profjim/pandoc-iki> for details. --Profjim
+
----
ikiwiki could also support LaTeX as a document type, again rendering to HTML.
an existing wishlist item.
> I think it would make sense to have "pagespec" in the name somehow.
+
+> > Good idea, how about `pagespecalias`? — [[Jon]]
+
>
> No, the strict/warnings does not make me puke. Have you read my perl
> code? :-P
> Well, except that websetup doesn't currently support configuring hashes
> like used here. Which is a pity, but has led me to try to avoid using
> such hashes in the setup file.
->
+
+> > If I removed the `getsetup` subroutine, it would not be exposed via
+> > website, is that right? I suppose it doesn't hurt to validate key, even if
+> > this risk was not there. Is the use of a hash here a blocker for adoption?
+> > — [[Jon]]
+
> Have you considered not defining the pagespec aliases in the setup file, but
> instead as directives on pages in the wiki? Using pagestate could store
> up the aliases that have been defined. It could however, be hard to get
> an alias `foo` would need to somehow depend on the page where the alias
> was defined. --[[Joey]]
+> > I haven't thought the dependency issue through beyond "that might be hard".
+> > Personally, I don't like defining stuff like this in pages, but I appreciate
+> > some do. There could be some complex scenarios where some pages rely on a
+> > pagespec alias defined on others; and could have their meanings changed by
+> > changing the definition. A user might have permission to edit a page with a
+> > definition on it but not on the pages that use it, and similar subtle permission
+> > bugs. I'm also not sure what the failure mode is if someone redefines an alias,
+> > and whether there'd be an unpredictable precedence problem.
+> > How about both methods? — [[Jon]]
+
Here's an example setup chunk:
pagespec_aliases:
> Probably needs to be `or internal(*)` --[[Joey]]
+> > Ah yes, could be, thanks. — [[Jon]]
+
> another useful pagespec alias for large maps:
basewiki: "sandbox or templates or templates/* or ikiwiki or ikiwiki/* or shortcuts or recentchanges or wikiicons/*"
> -- [[Jon]]
>> Useful indeed! --[[Joey]]
+
+---------------------------
+
+Based on the above, I have written an experimental plugin called "subset".
+It's in my "ikiplugins" repo on github, in the "experimental" branch.
+<https://github.com/rubykat/ikiplugins/blob/experimental/IkiWiki/Plugin/subset.pm>
+
+It takes Joey's suggestion of defining the subsets (aliases) as directives;
+I took the example of the [[plugins/shortcut]] plugin and designated a single special page as the one where the directives are defined,
+though unlike "shortcut" I haven't hardcoded the name of the page; it defaults to "subsets" but it can be re-defined in the config.
+
+I've also added a feature which one might call subset-caching; I had to override `pagespec_match_list` to do it, however.
+An extra parameter added to `pagespec_match_list` called `subset` which
+
+* limits the result to look *only* within the set of pages defined by the subset (uses the "list" option to pagespec_match_list to do this)
+* caches the result of the subset search so that the second time subset "foo" is used, it uses the stored result of the first search for "foo".
+
+This speeds things up if one is using a particular subset more than once, which one probably is if one bothered to define the subset in the first place.
+The speed increase is most dramatic when the site has a large number of pages and the number of pages in the subset is small.
+(this is similar to the "trail" concept I used in my [[plugins/contrib/report]] plugin, but not quite the same)
+
+Note that things like [[plugins/map]] can't make use of "subset" (yet) because they don't pass along all the parameters they're given.
+But [[plugins/contrib/report]] actually works without alteration because it does pass along all the parameters.
+
+Unfortunately I haven't figured out how to do the dependencies - I'd really appreciate help on that.
+
+--[[KathrynAndersen]]
+
+> > Cool! I like the caching idea. I'm not sure about the name. I don't like defining
+> > stuff in pages, but I appreciate this is a matter of taste, and would be happy with
+> > supporting both. — [[Jon]]
--- /dev/null
+The examples linked to www.pseudorandom.co.uk do not exist.
+
+Does anyone have recent examples of any image album that works with ikiwiki?
+
+-- [[JeremyReed]]
# DO NOT CHANGE ANYTHING IN THIS FILE.
# THe crazy bug reproduced here will go away if any of the calls
# to htmlize are changed.
+# Note: This was http://bugs.debian.org/376329 , and was fixed in
+# perl 5.14.
use warnings;
use strict;
use Test::More tests => 102;