urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2010-06-11 13:54:07 -04:00
parent 475b4199e1 77a3585e92
commit 0822b0fc34
6 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
View File

@ -21,4 +21,4 @@ It works fine with h2 and deeper. The square brackets also appear in the output
> [[done]] --[[Joey]]
>> It works here but it definitely does *not* work on my wiki; but on further experimentation, I believe my problem is being caused by JasonBlevins' [h1title](http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm) plugin.
>> It works here but it definitely does *not* work on my wiki; but on further experimentation, I believe my problem is being caused by JasonBlevins' [h1title](http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm) plugin.

2
doc/bugs/img_plugin_and_missing_heigth_value.mdwn
View File

@ -3,3 +3,5 @@ When I set up my picture page with `\[[!img defaults size=300x]]` then the html
> This is a bug. --[[Joey]]
> And .. [[fixed|done]] --[[Joey]]
>> Not quite; For some reason it requires me to update wiki pages twice before the height value shows up.

4
doc/bugs/img_vs_align.mdwn
View File

@ -29,3 +29,7 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
>> scripts again...
>>
>> --[[tschwinge]]
>>> It seems, the 'align=right' parameter gets filtered in my installation
>>> Are there other plugins, that could throw the parameter away?
>>> --[[jwalzer]]

8
doc/forum/wiki_name_in_page_titles.mdwn
View File

@ -23,4 +23,10 @@ that provides a `IS_HOMEPAGE` template variable? --[[JasonBlevins]]
>> few other small plugins brewing so I'll try to put up some contrib
>> pages for them soon. --[[JasonBlevins]]
[path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm
[path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
> I used the following trick in some page.tmpl:
>
> <title><TMPL_VAR WIKINAME><TMPL_IF NAME="PARENTLINKS">: <TMPL_VAR TITLE></TMPL_IF></title>
>
> --[[JeanPrivat]]

1
doc/ikiwikiusers.mdwn
View File

@ -146,6 +146,7 @@ Personal sites and blogs
* [Gustaf Thorslund's blog](http://blog.thorslund.org)
* [Ertug Karamatli](http://pages.karamatli.com)
* [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
* [Daniel Wayne Armstrong](http://circuidipity.com/)
Please feel free to add your own ikiwiki site!

17
doc/todo/htpasswd_mirror_of_the_userdb.mdwn 100644
View File

@ -0,0 +1,17 @@
[[!tag wishlist]]
Ikiwiki is static, so access control for viewing the wiki must be implemented on the web server side. Managing wiki users and access together, we can currently
* use [[httpauth|plugins/httpauth/]], but some [[passwordauth|plugins/passwordauth]] functionnality [[is missing|todo/httpauth_feature_parity_with_passwordauth/]];
* use [[passwordauth|plugins/passwordauth]] plus [[an Apache `mod_perl` authentication mechanism|plugins/passwordauth/discussion/]], but this is Apache-centric and enabling `mod_perl` just for auth seems overkill.
Moreover, when ikiwiki is just a part of a wider web project, we may want to use the same userdb for the other parts of this project.
I think an ikiwiki plugin which would (re)generate an htpasswd version of the user/passwd base (better, two htpasswd files, one with only the wiki admins and one with everyone) each time an user is added or modified would solve this problem:
* access control can be managed from the web server
* user management is handled by the passwordauth plugin
* htpasswd format is understood by various servers (Apache, lighttpd, nginx, ...) and languages commonly used for web development (perl, python, ruby)
* htpasswd files can be mirrored on other machines when the web site is distributed
-- [[nil]]