From a12dd235ea6afff3540da3f5e66e7abbadaa6944 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 27 Oct 2010 14:49:21 +0200 Subject: Fix some more links. DynDNS (which was resolving *.schwinge.homeip.net to my server at home) stopped supporting wildcard CNAMEs *.schwinge.homeip.net, so I now always have to use the canonical name (or pay for getting this back, or go looking for another service provider)... --- doc/forum/cutpaste.pm_not_only_file-local.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/forum') diff --git a/doc/forum/cutpaste.pm_not_only_file-local.mdwn b/doc/forum/cutpaste.pm_not_only_file-local.mdwn index 3563e3e01..0c5221cc9 100644 --- a/doc/forum/cutpaste.pm_not_only_file-local.mdwn +++ b/doc/forum/cutpaste.pm_not_only_file-local.mdwn @@ -3,7 +3,7 @@ has \[[!cut id=foo text="foo"]], and fileB does \[[!absorb pagenames=fileA]], and can then use \[[!paste id=foo]]. Therefore, I've written an [*absorb* directive / -plugin](http://www.thomas.schwinge.homeip.net/tmp/absorb.pm), which is meant to +plugin](http://schwinge.homeip.net/~thomas/tmp/absorb.pm), which is meant to absorb pages in order to get hold of their *cut* and *copy* directives' contents. This does work as expected. But it also absorbs page fileA's *meta* values, like a *meta title*, etc. How to avoid / solve this? -- cgit v1.2.3 From 43e399d7d221d060b76e86dce72beb5b04eea132 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Wed, 27 Oct 2010 20:51:34 +0000 Subject: --- doc/forum/Moving_wiki.git_folder__63__.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__.mdwn (limited to 'doc/forum') diff --git a/doc/forum/Moving_wiki.git_folder__63__.mdwn b/doc/forum/Moving_wiki.git_folder__63__.mdwn new file mode 100644 index 000000000..f3cc6375d --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__.mdwn @@ -0,0 +1,17 @@ +I folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. + +Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed + + srcdir => '/home/pixel/.notebook/wiki', + git_wrapper => '/home/pixel/.notebook/wiki.git/hooks/post-update', + +and that seems to be fine. However when I go to run ikiwiki --setup things go wrong: + + pixel@tosh: [~ (ruby-1.9.2-p0)] ➔ ikiwiki -setup .notebook/wiki.setup + successfully generated /home/pixel/public_html/wiki/ikiwiki.cgi + successfully generated /home/pixel/.notebook/wiki.git/hooks/post-update + fatal: '/home/pixel/wiki.git' does not appear to be a git repository + fatal: The remote end hung up unexpectedly + 'git pull origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 193. + +I've gone through wiki.setup and nothing has jumped out as the place to set this, have I missed something? -- cgit v1.2.3 From 2a224f5a8a81b923ba0da4fcb742fb293122f19b Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Wed, 27 Oct 2010 20:52:08 +0000 Subject: edit for typo --- doc/forum/Moving_wiki.git_folder__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/forum') diff --git a/doc/forum/Moving_wiki.git_folder__63__.mdwn b/doc/forum/Moving_wiki.git_folder__63__.mdwn index f3cc6375d..77d1da1ee 100644 --- a/doc/forum/Moving_wiki.git_folder__63__.mdwn +++ b/doc/forum/Moving_wiki.git_folder__63__.mdwn @@ -1,4 +1,4 @@ -I folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. +Hi folks, I created a simple wiki to keep notes and references for projects, it's worked quite nice so far. I decided to use git as it's what I use daily to manage code, and it's available on all my machines. Anyway, I wanted to move all the wiki source stuff into a subfolder so that it stops cluttering up my ~ directory. However, there seems to be a problem with moving wiki.git (I moved wiki, wiki.git and wiki.setup) and I'm not sure where to tell ikiwiki that the git directory has been moved. I changed -- cgit v1.2.3 From f840fb5c58ac4b0e5ab41165fbc0afd2d6a9a256 Mon Sep 17 00:00:00 2001 From: "http://users.itk.ppke.hu/~cstamas/openid/" Date: Wed, 27 Oct 2010 22:45:28 +0000 Subject: Added a comment --- .../comment_1_05238461520613f4ed1b0d02ece663bd._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment (limited to 'doc/forum') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment new file mode 100644 index 000000000..d654591c0 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_1_05238461520613f4ed1b0d02ece663bd._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://users.itk.ppke.hu/~cstamas/openid/" + ip="212.183.140.47" + subject="comment 1" + date="2010-10-27T22:45:28Z" + content=""" +I think you want to edit + + .git/config + +"""]] -- cgit v1.2.3 From 073bbe7ae00baa9ca89a61e43e53f072ac1b3b89 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:39:05 +0000 Subject: Added a comment: I'm trying to move the root repository --- .../comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment (limited to 'doc/forum') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment new file mode 100644 index 000000000..a761bbc76 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://pixel.dreamwidth.org/" + ip="65.29.14.21" + subject="I'm trying to move the root repository" + date="2010-10-28T02:39:04Z" + content=""" +This isn't my working repository (on my system it's called notebook, and I created it by: git clone wiki.git notebook presumably I could fix that one by editing config, once the other is working) this is the root repository. When I created my ikiwiki, it created 3 things in my home directory: wiki, wiki.git and wiki.setup. It's the wiki.git folder that is causing trouble. +"""]] -- cgit v1.2.3 From c53ddaf93abd16d2e64b62a465c630dee9a8a157 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:42:26 +0000 Subject: This reverts commit 073bbe7ae00baa9ca89a61e43e53f072ac1b3b89 --- .../comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment (limited to 'doc/forum') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment deleted file mode 100644 index a761bbc76..000000000 --- a/doc/forum/Moving_wiki.git_folder__63__/comment_2_0429a0bc807a7d290ec2d5e6be23cc16._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="http://pixel.dreamwidth.org/" - ip="65.29.14.21" - subject="I'm trying to move the root repository" - date="2010-10-28T02:39:04Z" - content=""" -This isn't my working repository (on my system it's called notebook, and I created it by: git clone wiki.git notebook presumably I could fix that one by editing config, once the other is working) this is the root repository. When I created my ikiwiki, it created 3 things in my home directory: wiki, wiki.git and wiki.setup. It's the wiki.git folder that is causing trouble. -"""]] -- cgit v1.2.3 From e8802c885a55c22b5ff754839654d0785ad91991 Mon Sep 17 00:00:00 2001 From: "http://pixel.dreamwidth.org/" Date: Thu, 28 Oct 2010 02:54:15 +0000 Subject: Added a comment --- .../comment_2_72b2b842dfa0cfaf899fe7af12977519._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment (limited to 'doc/forum') diff --git a/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment b/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment new file mode 100644 index 000000000..f2e7ece18 --- /dev/null +++ b/doc/forum/Moving_wiki.git_folder__63__/comment_2_72b2b842dfa0cfaf899fe7af12977519._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://pixel.dreamwidth.org/" + ip="65.29.14.21" + subject="comment 2" + date="2010-10-28T02:54:15Z" + content=""" +That did it thanks! + +Should I make some sort of edit in the setup page? I've used git for a while and for whatever reason it never occurred to me that this was from git, not from ikiwiki itself. +"""]] -- cgit v1.2.3