From 78dfa75303a660a82c67b574cd05243bae9a5fe9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkO4VQw6MI8y9Tqnjv7B2ZaqLa9dd0BCyw" Date: Wed, 18 Sep 2013 11:24:06 -0400 Subject: [PATCH 01/12] rename rcs.mdwn to rcs.Makefile --- doc/{rcs.mdwn => rcs.Makefile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{rcs.mdwn => rcs.Makefile} (100%) diff --git a/doc/rcs.mdwn b/doc/rcs.Makefile similarity index 100% rename from doc/rcs.mdwn rename to doc/rcs.Makefile From 73b536d908939b245f946121ce152e1869317fff Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Wed, 18 Sep 2013 16:03:09 -0400 Subject: [PATCH 02/12] git revert and push said "prohibited by allowed_attachments (user is not an admin)", trying to revert webfully This reverts commit 78dfa75303a660a82c67b574cd05243bae9a5fe9 --- doc/{rcs.Makefile => rcs.mdwn} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{rcs.Makefile => rcs.mdwn} (100%) diff --git a/doc/rcs.Makefile b/doc/rcs.mdwn similarity index 100% rename from doc/rcs.Makefile rename to doc/rcs.mdwn From 096619f738a097a3ed42a863c8b5e0c001829c99 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Wed, 18 Sep 2013 19:34:02 -0400 Subject: [PATCH 03/12] workaround noworkaround --- doc/plugins/toc/discussion.mdwn | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/plugins/toc/discussion.mdwn b/doc/plugins/toc/discussion.mdwn index 287ba5656..11c874fcb 100644 --- a/doc/plugins/toc/discussion.mdwn +++ b/doc/plugins/toc/discussion.mdwn @@ -10,7 +10,7 @@ Why doesn't the TOC appear in the edit page preview? It only appears when the p > Fixed. --[[Joey]] Just ran into a side effect of `\[[!toc]]` being a NOP in pages -which are inlined: pages with `\[[!template id=note text="\[[!toc]]"]]` +which are inlined: pages with `\[[!template id=note text="[[!toc]]"]]` wound up having the note rendered in feeds as "Use this template to insert a note into a page". Worked around this by making a local copy of the template and removing its `...` @@ -18,9 +18,14 @@ section. Besides needing to generate guaranteed-unique anchor names, are there other reasons this directive couldn't be made to work on inlined pages? --[[schmonz]] -> Workaround: `\[[!template id=note text=" \[[!toc]]"]]` +> Workaround: `\[[!template id=note text=" [[!toc]]"]]` > (with whitespace) should work, because then Perl will consider > the string to be a true value. > > Longer-term, my branch on [[bugs/template_creation_error]] > aims to fix this sort of thing. --[[smcv]] + +>> Workaround seems not to. Maybe whitespace is getting trimmed +>> along the way and it stays falsish. Interested in your branch; +>> sorry I can't offer precise feedback right now, but it looks sane +>> at a glance. --[[schmonz]] From af265dd78ae3eb936acecc9363d7415016f9f64c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnWrt_1YwzE4yP3dF061Wy7uNjPDefJm_I" Date: Thu, 19 Sep 2013 15:42:17 -0400 Subject: [PATCH 04/12] --- doc/forum/download_links_for_attachments.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/download_links_for_attachments.mdwn diff --git a/doc/forum/download_links_for_attachments.mdwn b/doc/forum/download_links_for_attachments.mdwn new file mode 100644 index 000000000..4d6e9c70c --- /dev/null +++ b/doc/forum/download_links_for_attachments.mdwn @@ -0,0 +1,11 @@ +hi, +I'm not sure if I'm doing something wrong but I can't figure out how to get a download link for uploaded attachments. +I'd like to be able to upload arbitrary attachments eg. settings.xml or .gitinore or setup.txt or stuff.zip and be able to add a link to the wiki page which should let the user instantly download that file. +I thought it might be as simple as adding a directive eg. [[!downloadlink .gitinore]] . + +This is driving me nuts, so any help or pointers will be appreciated even if I have to dig in to write a plugin. +I'm running the 3.20100815.9 on Debian 6.0 but then also tried a manual install of 3.20130904.1 which seemed to have caused a bunch of timeout errors and not much improvement on the attachment issue. +Should I try the git version? + +thanks +marius From b362acedbcb5b042daec39e136b627bddf777d1c Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 21 Sep 2013 09:56:13 -0400 Subject: [PATCH 05/12] explicitely request git-annex support --- doc/todo/git-annex_support.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/git-annex_support.mdwn diff --git a/doc/todo/git-annex_support.mdwn b/doc/todo/git-annex_support.mdwn new file mode 100644 index 000000000..e3cec2be1 --- /dev/null +++ b/doc/todo/git-annex_support.mdwn @@ -0,0 +1,5 @@ +A dear [[wishlist]] which would resolve [[this question|forum/ikiwiki_and_big_files]]: ikiwiki should support git-annex repositories. + +I am not sure how this would work, but from my POV, it should do a `git annex get` when new commits are pushed to its bare repo. This would assume, of course, that there's another repo somewhere that ikiwiki has access to, which works for HTTP-style remotes, but could be more problematic for SSH remotes that require a key. + +Another solution would be to make ikiwiki a remote itself and allow users to push big files to it. The only problem I see with this is those files would end up in the bare repository and not necessarily show up in the web rendering. Ideally, a big file pushed would be hardlinked between the two repos, but I am not sure git-annex actually supports that. --[[anarcat]] From bd96b2273ed3dc729e303abc6c220189a839552e Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 21 Sep 2013 09:58:45 -0400 Subject: [PATCH 06/12] Added a comment: opened todo --- .../comment_4_fd8a0cb8872d9de55465e8db93d67619._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/ikiwiki_and_big_files/comment_4_fd8a0cb8872d9de55465e8db93d67619._comment diff --git a/doc/forum/ikiwiki_and_big_files/comment_4_fd8a0cb8872d9de55465e8db93d67619._comment b/doc/forum/ikiwiki_and_big_files/comment_4_fd8a0cb8872d9de55465e8db93d67619._comment new file mode 100644 index 000000000..da708611d --- /dev/null +++ b/doc/forum/ikiwiki_and_big_files/comment_4_fd8a0cb8872d9de55465e8db93d67619._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + ip="2001:1928:1:9::1" + subject="opened todo" + date="2013-09-21T13:58:45Z" + content=""" +I explicitely opened a [[todo item|todo/git-annex_support]] about git-annex. From what I can see, it's currently unsupported, and there would be issues with file duplication between the bare repo and the srcdir, at the very least, unless git-annex magically supports hardlinks in local repos. +"""]] From 36305652eade849e19801dca856ba74e21d6a9b1 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sat, 21 Sep 2013 10:05:37 -0400 Subject: [PATCH 07/12] link to the git-annex feature request --- doc/todo/git-annex_support.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/git-annex_support.mdwn b/doc/todo/git-annex_support.mdwn index e3cec2be1..30d79843d 100644 --- a/doc/todo/git-annex_support.mdwn +++ b/doc/todo/git-annex_support.mdwn @@ -2,4 +2,4 @@ A dear [[wishlist]] which would resolve [[this question|forum/ikiwiki_and_big_fi I am not sure how this would work, but from my POV, it should do a `git annex get` when new commits are pushed to its bare repo. This would assume, of course, that there's another repo somewhere that ikiwiki has access to, which works for HTTP-style remotes, but could be more problematic for SSH remotes that require a key. -Another solution would be to make ikiwiki a remote itself and allow users to push big files to it. The only problem I see with this is those files would end up in the bare repository and not necessarily show up in the web rendering. Ideally, a big file pushed would be hardlinked between the two repos, but I am not sure git-annex actually supports that. --[[anarcat]] +Another solution would be to make ikiwiki a remote itself and allow users to push big files to it. The only problem I see with this is those files would end up in the bare repository and not necessarily show up in the web rendering. Ideally, a big file pushed would be hardlinked between the two repos, but it seems [git-annex doesn't support that yet](http://git-annex.branchable.com/todo/wishlist:_use_hardlinks_for_local_clones). --[[anarcat]] From a9f82ebf91f6b79a4150d02dbf94bdfac8115b52 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnQpl89u6Sh88gg2irKxbfiwg5h0uLZyzg" Date: Sun, 22 Sep 2013 00:02:12 -0400 Subject: [PATCH 08/12] --- doc/forum/search_plugin_questions.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/search_plugin_questions.mdwn diff --git a/doc/forum/search_plugin_questions.mdwn b/doc/forum/search_plugin_questions.mdwn new file mode 100644 index 000000000..4ab985c82 --- /dev/null +++ b/doc/forum/search_plugin_questions.mdwn @@ -0,0 +1,13 @@ +Hello, + +I have started using Ikiwiki for a personal site, which is great. I would like to add search functionality with the search plugin, so have it configured with the one parameter needed, and it does see files. + +However, it seems to be doing a couple things with URLs that it shouldn't in this case: + +* The link to the page has an extraneous "/cgi" in it, e.g. instead of "https://[hostname]/sandbox/" it has ""https://[hostname]/cgi/sandbox/". +* Also, the help link is the same, so links to "https://[hostname]/cgi/ikiwiki/searching/". + +Another question I had is whether I can restrict the pages which get searched? I would like to have an internal section which isn't linked, and which doesn't pop up in search results. I know that I can configure the web server to restrict access, but would prefer that the page snippet and its presence not be advertised. + + Thanks! + Tim From b909061a3766f5aad0b17e5b68601f50d1613ab7 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 22 Sep 2013 05:07:44 -0400 Subject: [PATCH 09/12] Added a comment --- ...t_1_d634b00ab758c9fbc43528b9a3176257._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/search_plugin_questions/comment_1_d634b00ab758c9fbc43528b9a3176257._comment diff --git a/doc/forum/search_plugin_questions/comment_1_d634b00ab758c9fbc43528b9a3176257._comment b/doc/forum/search_plugin_questions/comment_1_d634b00ab758c9fbc43528b9a3176257._comment new file mode 100644 index 000000000..947b4632c --- /dev/null +++ b/doc/forum/search_plugin_questions/comment_1_d634b00ab758c9fbc43528b9a3176257._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 1" + date="2013-09-22T09:07:43Z" + content=""" +It sounds as though the `url` and/or `cgiurl` settings in your setup +file might be wrong. What are they? What is the actual \"root\" URL +of your wiki in your web server, and what is the actual URL of the +CGI script? + +Regarding private stuff, I would recommend making a separate ikiwiki +instance for that, particularly if your wiki accepts edits from +untrusted people. For instance, anyone who can insert a \[[!map]] +directive can easily enumerate every page in your wiki. +"""]] From da327be29ccf2d3538182d98653f1c5109cc6601 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 22 Sep 2013 05:16:23 -0400 Subject: [PATCH 10/12] --- doc/todo/git-annex_support.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/git-annex_support.mdwn b/doc/todo/git-annex_support.mdwn index 30d79843d..9ebd11e06 100644 --- a/doc/todo/git-annex_support.mdwn +++ b/doc/todo/git-annex_support.mdwn @@ -3,3 +3,9 @@ A dear [[wishlist]] which would resolve [[this question|forum/ikiwiki_and_big_fi I am not sure how this would work, but from my POV, it should do a `git annex get` when new commits are pushed to its bare repo. This would assume, of course, that there's another repo somewhere that ikiwiki has access to, which works for HTTP-style remotes, but could be more problematic for SSH remotes that require a key. Another solution would be to make ikiwiki a remote itself and allow users to push big files to it. The only problem I see with this is those files would end up in the bare repository and not necessarily show up in the web rendering. Ideally, a big file pushed would be hardlinked between the two repos, but it seems [git-annex doesn't support that yet](http://git-annex.branchable.com/todo/wishlist:_use_hardlinks_for_local_clones). --[[anarcat]] + +> One technical problem with this is that ikiwiki doesn't allow symlinks +> for [[security]], but git-annex relies on symlinks (unless you're in +> direct mode, but I'm not sure that's really desirable here). +> I'd like to make symlinks possible without compromising security, +> but it'll be necessary to be quite careful. --[[smcv]] From a655dc883ce83ef274ca1926de21e81ec6a6f448 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkickHAzX_uVJMd_vFJjae6SLs2G38URPU" Date: Sun, 22 Sep 2013 05:35:17 -0400 Subject: [PATCH 11/12] ikiwiki git-annex example online --- doc/todo/git-annex_support/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/todo/git-annex_support/discussion.mdwn diff --git a/doc/todo/git-annex_support/discussion.mdwn b/doc/todo/git-annex_support/discussion.mdwn new file mode 100644 index 000000000..5d1320af3 --- /dev/null +++ b/doc/todo/git-annex_support/discussion.mdwn @@ -0,0 +1,9 @@ +Hi, + +I'm currently using git-annex with ikiwiki for a website of mine. [stockholm.kalleswork.net](http://stockholm.kalleswork.net). The site relies heavily on the osm and album plugins. The site just went online and is a bit of an experiment, things seem a bit fragile but works for now. (ikiwiki 3.20130904.1)(git-annex 4.20130904.1) + +The trick I had to do to get git-annex, ikiwiki and the album plugin to work was to initialize an annex remote in the `$srcdir`. Then block the bare origin (ie wiki.git folder) with `annex-sync = false` and `annex-ignore = true` on **both** the server and the working laptop. This is to avoid polluting the wiki.git bare repo with annex stuff. + +Another critical thing for this to work was to set the `$srcdir` on the server to direct mode `git-annex direct` before adding any content anywhere. On the laptop I can use indirect mode without problems. + +For now syncing annex, pushing updates to mdwns etc all seem to work and the album plugin picks up images etc. I'm sure there are problems ahead with this setup but it does seem to work. I barely know how to use git, git-annex and ikiwiki and much less understand how it works behind the scenes. So do let me know if there are fatal flaws in my setup ;) -- Kalle From 19c1d2c3cd33ccdb1986c4bfbca81c04e059fcc7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnQpl89u6Sh88gg2irKxbfiwg5h0uLZyzg" Date: Sun, 22 Sep 2013 11:44:52 -0400 Subject: [PATCH 12/12] Added a comment --- ...omment_2_b731c664d314afd1d45485716f39ac3b._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/search_plugin_questions/comment_2_b731c664d314afd1d45485716f39ac3b._comment diff --git a/doc/forum/search_plugin_questions/comment_2_b731c664d314afd1d45485716f39ac3b._comment b/doc/forum/search_plugin_questions/comment_2_b731c664d314afd1d45485716f39ac3b._comment new file mode 100644 index 000000000..1cf007f19 --- /dev/null +++ b/doc/forum/search_plugin_questions/comment_2_b731c664d314afd1d45485716f39ac3b._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnQpl89u6Sh88gg2irKxbfiwg5h0uLZyzg" + nickname="Tim" + subject="comment 2" + date="2013-09-22T15:44:51Z" + content=""" +Thanks. The url parameter is the full hostname, e.g. http://example.com +The cgiurl parameter is the url plus the path to the CGI, e.g. http://example.com/cgi/iw.cgi + +Regular operation of Ikiwiki seems fine, so I can log in, edit pages and so on. As far as the more private part goes, the site is essentially just me, so there won't be pages with odd parameters in them unless I add them. :) +"""]]