Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commit
3182cc6710
|
@ -0,0 +1,2 @@
|
||||||
|
Shortcuts such as \[[!google foo]] do not work when previewing pages.
|
||||||
|
--[[JasonBlevins]]
|
|
@ -39,6 +39,7 @@ Projects
|
||||||
* [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
|
* [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
|
||||||
* [monkeysphere](http://web.monkeysphere.info/)
|
* [monkeysphere](http://web.monkeysphere.info/)
|
||||||
* [The Walden Effect](http://www.waldeneffect.org/)
|
* [The Walden Effect](http://www.waldeneffect.org/)
|
||||||
|
* The [Fortran Wiki](http://fortranwiki.org/)
|
||||||
|
|
||||||
Personal sites and blogs
|
Personal sites and blogs
|
||||||
========================
|
========================
|
||||||
|
|
|
@ -17,3 +17,8 @@ There is also a mismatch between the way Ikiwiki handles conflicts and the
|
||||||
way Monotone handles conflicts. At present, if there is a conflict, then
|
way Monotone handles conflicts. At present, if there is a conflict, then
|
||||||
Ikiwiki will commit a revision with conflict markers before presenting it
|
Ikiwiki will commit a revision with conflict markers before presenting it
|
||||||
to the user. This is ugly, but there is no clean way to fix it at present.
|
to the user. This is ugly, but there is no clean way to fix it at present.
|
||||||
|
|
||||||
|
Also note that not all recent ikiwiki features have been implemented in the
|
||||||
|
monotone plugin. At the moment we're missing:
|
||||||
|
|
||||||
|
* [[todo/Untrusted_push_in_Monotone]]
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
As noted in [[tips/untrusted_git_push]] an untrusted push capability was added recently, but only implemented in git.
|
||||||
|
(See also [[todo/rcs_updates_needed]])
|
||||||
|
|
||||||
|
This note describes (but does not implement) an approach for this with the [[rcs/monotone]] rcs backend.
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
Monotone behaves a little differently to git in its networking. Git allows anyone to try to push, and then
|
||||||
|
check whether it is ok before finally accepting it. Monotone has no way to accept or reject revisions
|
||||||
|
in this way. However, monotone does have the ability to mark revisions, and to ignore unmarked revisions.
|
||||||
|
|
||||||
|
This marking capability can be used to achieve a somewhat similar effect to what happens with git. The
|
||||||
|
problem with this is that anyone could put anything into the monotone database, and while this wouldn't
|
||||||
|
affect ikiwiki, it seems bad to leave open, untrusted storage on the web.
|
||||||
|
|
||||||
|
The Plan
|
||||||
|
=====
|
||||||
|
|
||||||
|
In the `note_netsync_revision_received` hook in the monotone server, have the server check to make sure
|
||||||
|
that either a) the revision is signed by someone trusted or, b) the revision is checked using the same
|
||||||
|
hook that git uses in `pre-receive`. If the revision passes the ikiwiki `pre-receive` check then the
|
||||||
|
monotone hook signs the revision. This gives that revision the 'ikiwiki seal of approval'.
|
||||||
|
|
||||||
|
You'll also want to update the monotone trust hooks to only trust revisions signed by trusted people, or
|
||||||
|
ikiwiki.
|
||||||
|
|
||||||
|
Now anyone can upload a revision, but only those signed by a trusted person, or which pass the ikiwiki
|
||||||
|
check and so get signed by the ikiwiki key, will be seen by ikiwiki.
|
|
@ -23,3 +23,10 @@ What's your opinion, Joey? I hope it's also useful for another ikiwiki lovers :)
|
||||||
>>> Seems like a job for good ol' string interpolation. rootpage="post/$current_year/$current_month/$current_day"
|
>>> Seems like a job for good ol' string interpolation. rootpage="post/$current_year/$current_month/$current_day"
|
||||||
>>> Ikiwiki could provide some vars, and it would be nice to write plugins to also provide vars. Sort of like templates.
|
>>> Ikiwiki could provide some vars, and it would be nice to write plugins to also provide vars. Sort of like templates.
|
||||||
>>> Does that feel OK? --[[sabr]]
|
>>> Does that feel OK? --[[sabr]]
|
||||||
|
|
||||||
|
> I want the exact same thing. My compromise was to create a `datedblog` module which overrides `inline`'s `sessioncgi` hook
|
||||||
|
> with something that sets the new page name to `%Y-%m-%d.$page` and sets up a meta directive at the beginning of
|
||||||
|
> the content, with the title you wanted. Now if you use the `datedblog` module, you get dated blog entries. But I'd
|
||||||
|
> like to have traditional `inline` functionality too. This would work great if there were a way to change the `do`
|
||||||
|
> parameter in the `blogpost` template's form; if I could change it to `datedblog` instead of `blog` then I could hook
|
||||||
|
> my datedblog module in nicely, without having to override anything. What would be the right way to do that? --[[neale]]
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
[[!meta redir=users/jasonblevins]]
|
|
@ -1 +1,10 @@
|
||||||
I have a keyboard and I'm not afraid to use it.
|
I used IkiWiki to supplant some custom journal software. I like that it uses
|
||||||
|
the filesystem, my intent is to make journal entries as future-proof as
|
||||||
|
possible. I'll probably start using it for generation of entire sites, soon.
|
||||||
|
|
||||||
|
Things generated by IkiWiki with some fancypants stylesheets:
|
||||||
|
|
||||||
|
* [woozle.org](http://woozle.org/)
|
||||||
|
* [My page](http://woozle.org/~neale/)
|
||||||
|
* [Amy's blog](http://woozle.org/~aim/blog/)
|
||||||
|
* [Heidi's blog](http://woozle.org/~heidi/blog/)
|
||||||
|
|
Loading…
Reference in New Issue