From 38003fe23a8358f08d22bc5f85c087e5f329e7e9 Mon Sep 17 00:00:00 2001 From: "http://k1024.org/~iusty/" Date: Sun, 29 Aug 2010 21:59:36 +0000 Subject: Add comment on the cleanup spam section --- doc/tips/spam_and_softwaresites/discussion.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/tips/spam_and_softwaresites/discussion.mdwn (limited to 'doc/tips') diff --git a/doc/tips/spam_and_softwaresites/discussion.mdwn b/doc/tips/spam_and_softwaresites/discussion.mdwn new file mode 100644 index 000000000..21f0a5d7e --- /dev/null +++ b/doc/tips/spam_and_softwaresites/discussion.mdwn @@ -0,0 +1,8 @@ +In the cleanup spam section: + +> Caveat: if there are no commits you want to keep (i.e. all the commits since the last merge into master are either spam or spam reverts) then git rebase will abort. + +Wouldn't it be enough then to use `git reset --hard` to the desired last good commit? + +regards, +iustin -- cgit v1.2.3 From d478b31cf50351b45d02ee64a8c51c08ad9f870f Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2.Pjpm0G0Z6F9LiGW4cYO84pIrb.Lg--#137de" Date: Mon, 30 Aug 2010 07:32:49 +0000 Subject: --- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/tips') diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn index ea7835b33..05fd19a9b 100644 --- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn +++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn @@ -273,5 +273,5 @@ their own version of the website, use it to track bugs for that branch, and when the branch is ready, all these changes can be merged back into the mainline of the project. -Ikiwiki powers its own bug tracking system. To see how wiki bug tracking +Ikiwiki powers its own [online bug tracking system](http://www.bontq.com). To see how wiki bug tracking works in practice, visit the [[bugs]] or [[TODO]] pages. -- cgit v1.2.3 From 2d411d7729f2afa61afd4fd406747a204b937175 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Mon, 30 Aug 2010 10:21:50 +0200 Subject: Revert spam --- doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn | 2 +- doc/freesoftware.mdwn | 2 +- doc/ikiwikiusers.mdwn | 1 - doc/sitemap.mdwn | 3 --- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 2 +- doc/usage.mdwn | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-) (limited to 'doc/tips') diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn index f34b8dc13..7f9fb67e9 100644 --- a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn +++ b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn @@ -1,6 +1,6 @@ If `comments_allowdirectives` is set, previewing a comment can run directives that create files. (Eg, img.) Unlike editpage, it does not -keep track of those files and [web based issue tracker](http://www.bontq.com) expire them. So the files will linger in +keep track of those files and expire them. So the files will linger in destdir forever. Probably when the user then tries to save the comment, ikiwiki will refuse diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 14161b8ca..2243d9b1f 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -5,7 +5,7 @@ GNU [[GPL]], version 2 or later. The parts of ikiwiki that become part of your own wiki (the [[basewiki]] pages (but not the smilies) and the [[templates]]) are licensed -as follows: [online bug tracking](http://www.bontq.com) +as follows: > Redistribution and use in source and compiled forms, with or without > modification, are permitted under any circumstances. No warranty. diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 3265d77da..2f70c67b7 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -15,7 +15,6 @@ Projects & Organizations * The [cairo graphics library](http://cairographics.org/) website. * The [Portland State Aerospace Society](http://psas.pdx.edu) website. Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend). * [Planet Debian upstream](http://updo.debian.net/) -* [Hosted Bug Tracking Software](http://www.bontq.com) * [Debian Mentors wiki](http://jameswestby.net/mentors/) * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/) * The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman) diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index a011ff40d..3c11ed423 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -3,7 +3,4 @@ This map excludes discussion pages, as well as subpages that are in feeds. [[!map pages="* and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* and !sandbox/* and !todo/* and !users/* - and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] -[bug tracking database](http://www.bontq.com) - diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn index 05fd19a9b..ea7835b33 100644 --- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn +++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn @@ -273,5 +273,5 @@ their own version of the website, use it to track bugs for that branch, and when the branch is ready, all these changes can be merged back into the mainline of the project. -Ikiwiki powers its own [online bug tracking system](http://www.bontq.com). To see how wiki bug tracking +Ikiwiki powers its own bug tracking system. To see how wiki bug tracking works in practice, visit the [[bugs]] or [[TODO]] pages. diff --git a/doc/usage.mdwn b/doc/usage.mdwn index cbcd0e445..840d105d2 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -355,7 +355,7 @@ also be configured using a setup file. * ikiwiki --setup my.setup --refresh Refresh the wiki, using settings from my.setup, and avoid - rebuilding any pages that have not changed. [Issue tracking tools](http://www.bontq.com). This is faster. + rebuilding any pages that have not changed. This is faster. * ikiwiki --setup my.setup --refresh --wrappers @@ -380,7 +380,6 @@ also be configured using a setup file. * [[ikiwiki-update-wikilist]](1) * [[ikiwiki-transition]](1) - # AUTHOR Joey Hess -- cgit v1.2.3 From 1b1c30a713f4e5273002a633c375821598974c05 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 17:23:13 -0400 Subject: remove note about git-daemon bug Seems to be fixed with git 1.7.1 --- doc/tips/untrusted_git_push.mdwn | 8 -------- 1 file changed, 8 deletions(-) (limited to 'doc/tips') diff --git a/doc/tips/untrusted_git_push.mdwn b/doc/tips/untrusted_git_push.mdwn index 3573a0ddf..b74e0e9d9 100644 --- a/doc/tips/untrusted_git_push.mdwn +++ b/doc/tips/untrusted_git_push.mdwn @@ -112,11 +112,3 @@ abort the push before refs are updated. However, the changeset will still be present in your repository, wasting space. Since nothing refers to it, it will be expired eventually. You can speed up the expiry by running `git prune`. - -When aborting a push, ikiwiki displays an error message about why it didn't -accept it. If using git over ssh, the user will see this error message, -which is probably useful to them. But `git-daemon` is buggy, and hides this -message from the user. This can make it hard for users to figure out why -their push was rejected. (If this happens to you, look at "'git log --stat -origin/master..`" and think about whether your changes would be accepted -over the web interface.) -- cgit v1.2.3 From d2fbde0e814d873017ccc7d71eb585b9391dff9a Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Sun, 12 Sep 2010 19:25:38 -0500 Subject: new version of the ikiwiki vim plugin. docs upgraded. new forum post --- doc/forum/ikiwiki_vim_integration.mdwn | 17 +++++++++++++++++ doc/forum/link_autocompletion_in_vim.mdwn | 7 ++++++- doc/plugins/contrib/headinganchors.mdwn | 1 + doc/tips/vim_and_ikiwiki.mdwn | 28 ++++++++++++++++++++++++++++ doc/tips/vim_syntax_highlighting.mdwn | 5 +++++ 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 doc/forum/ikiwiki_vim_integration.mdwn create mode 100644 doc/tips/vim_and_ikiwiki.mdwn (limited to 'doc/tips') diff --git a/doc/forum/ikiwiki_vim_integration.mdwn b/doc/forum/ikiwiki_vim_integration.mdwn new file mode 100644 index 000000000..4724807e8 --- /dev/null +++ b/doc/forum/ikiwiki_vim_integration.mdwn @@ -0,0 +1,17 @@ +Hi all. I upgraded the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968) +so that now it supports: + + * Jumping to the file corresponding to the wikilink under the cursor. + * Creating the file corresponding to the wikilink under the cursor (including + directories if necessary.) + * Jumping to the previous/next wikilink in the current file. + * Autocomplete link names. + +Download it from [here](http://www.vim.org/scripts/script.php?script_id=2968) + +I've also created a new page unifying all the hints available here to use vim +with ikiwiki files, in [[tips/vim_and_ikiwiki]] + + +--[[jerojasro]] + diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn index 7d3ed8b02..a46c7e4c1 100644 --- a/doc/forum/link_autocompletion_in_vim.mdwn +++ b/doc/forum/link_autocompletion_in_vim.mdwn @@ -1,5 +1,10 @@ +This page is deprecated. See [[tips/vim_and_ikiwiki]] for the most up to date +content. + +------ + I extended the functionality of the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968) -(see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of +(see [[here|tips/vim_ikiwiki_ftplugin]]) to allow completion of wikilinks from inside vim, through the omnicompletion mechanism. It still has some bugs, but is usable, and will not destroy your data. It can diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn index becbf89a5..5ef054bce 100644 --- a/doc/plugins/contrib/headinganchors.mdwn +++ b/doc/plugins/contrib/headinganchors.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=headinganchors author="[[PaulWise]]"]] +[[ikiwiki/directive/cosa]] This is a simple plugin to add ids (which will serve as [[anchor]]s) to all headings, based on their text. It works as a postprocessing filter, allowing it to work on mdwn, wiki, html, diff --git a/doc/tips/vim_and_ikiwiki.mdwn b/doc/tips/vim_and_ikiwiki.mdwn new file mode 100644 index 000000000..eb22e353a --- /dev/null +++ b/doc/tips/vim_and_ikiwiki.mdwn @@ -0,0 +1,28 @@ +# Vim and ikiwiki + +## Syntax highlighting + +[ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim +syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights +directives and wikilinks. It only supports prefixed directives, i.e., +\[[!directive foo=bar baz]], not the old format with spaces. + +------ + +The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however, +it seems to not be [[maintained +anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]], +and it has some [[issues|forum/ikiwiki_vim_syntaxfile]]. + +## Page creation and navigation + +The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) package +is a vim plugin that enables you to do the following from inside vim: + + * Jumping to the file corresponding to the wikilink under the cursor. + * Creating the file corresponding to the wikilink under the cursor (including + directories if necessary.) + * Jumping to the previous/next wikilink in the current file. + * Autocomplete link names. + +Download it from [here](http://www.vim.org/scripts/script.php?script_id=2968) diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn index bf7104aec..8f2fdc1f0 100644 --- a/doc/tips/vim_syntax_highlighting.mdwn +++ b/doc/tips/vim_syntax_highlighting.mdwn @@ -1,3 +1,8 @@ +This page is deprecated. See [[tips/vim_and_ikiwiki]] for the most up to date +content + +-------- + [ikiwiki-syntax](http://www.vim.org/scripts/script.php?script_id=3156) is a vim syntax highlighting file for ikiwiki [[ikiwiki/markdown]] files. It highlights directives and wikilinks. It only supports prefixed directives, i.e., -- cgit v1.2.3 From 16aad6825d2cdae2c1e06604f9d5652d376fca18 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" Date: Tue, 14 Sep 2010 17:04:14 +0000 Subject: corrected link --- doc/tips/vim_and_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/tips') diff --git a/doc/tips/vim_and_ikiwiki.mdwn b/doc/tips/vim_and_ikiwiki.mdwn index eb22e353a..e4136aa5d 100644 --- a/doc/tips/vim_and_ikiwiki.mdwn +++ b/doc/tips/vim_and_ikiwiki.mdwn @@ -9,7 +9,7 @@ directives and wikilinks. It only supports prefixed directives, i.e., ------ -The previous syntax definition for ikiwiki links is at [[ikiwiki.vim]]; however, +The previous syntax definition for ikiwiki links is at [[vim_syntax_highlighting/ikiwiki.vim]]; however, it seems to not be [[maintained anymore|forum/navigation_of_wiki_pages_on_local_filesystem_with_vim#syn-maintenance]], and it has some [[issues|forum/ikiwiki_vim_syntaxfile]]. -- cgit v1.2.3 From 2745dfee60fa890ed0ecb8f53528e8a8a0803066 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 19 Sep 2010 20:23:13 +0000 Subject: Add link to html5shiv. --- doc/tips/html5.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/tips') diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn index 945efc4bc..8fbbb2ebb 100644 --- a/doc/tips/html5.mdwn +++ b/doc/tips/html5.mdwn @@ -15,7 +15,8 @@ No care is taken to add backwards compatability hacks for browsers that are not html5 aware (like MSIE). If you want to include the javascript with those hacks, you can edit `page.tmpl` to do so. [Dive Into HTML5](http://diveintohtml5.org/) is a good reference for -current compatability issues and workarounds with html5. +current compatability issues and workarounds with html5. And a remotely-loadable +JS shiv for enabling HTML5 elements in IE is available through [html5shiv at Google Code](http://code.google.com/p/html5shiv/). --- -- cgit v1.2.3 From ed2071802f3f637e191eaefbf264f4439b2b3e2d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0-WSZnp73Gr2n4a4tmxVPY5kUE50lYH4" Date: Mon, 4 Oct 2010 14:34:35 +0000 Subject: Adding apache2 dependencies to enable CGI --- doc/tips/dot_cgi.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn index da55c1f1c..42a0aa7bf 100644 --- a/doc/tips/dot_cgi.mdwn +++ b/doc/tips/dot_cgi.mdwn @@ -26,6 +26,8 @@ configuration changes should work anywhere. Or, if you've put it in a `~/public_html`, edit `/etc/apache2/mods-available/userdir.conf`. + You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`. + * You may also want to enable the [[plugins/404]] plugin. To make apache use it, the apache config file will need a further modification to make it use ikiwiki's CGI as the apache 404 handler. -- cgit v1.2.3 From c752be0acb942036a2dfd69dcfde06c17860db34 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:53:32 +0000 Subject: Mac OS X Snow Leopard Installing IkiWiki Tips --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 81 ++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn new file mode 100644 index 000000000..2c3428b3f --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -0,0 +1,81 @@ +These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a three year old machine with a lot of stuff on it so it took quite a while, YMMV. + +The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + +## installing git: + +curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O +tar xzvf git-(latest version).tar.gz +cd git-(latest version) +./configure --prefix=/usr/local +NO_MSGFMT=yes make prefix=/usr/local all +sudo make install + +git config --global user.name "firstname lastname" +git config --global user.email "email here" +git config --global color.ui "auto" + +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ + + +## installing ikiwiki: +I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I like to install test software in /opt. No particular reason. You could install to defaults. + +perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +perl Makefile.PL LIB=/Library/Perl/5.10.0 +make +make install +sudo install -d /opt/ikiwiki +sudo install -m 0644 wikilist /opt/ikiwiki +sudo install -m 0644 auto.setup /opt/ikiwiki +sudo install -m 0644 auto-blog.setup /opt/ikiwiki + +when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + +## using git from inside a git folder: +start with git clone, then learn to do the git dance like this. +git pull +make your changes to your clone +git commit -a -m "message here" +git push + +When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. + +## installing gitweb + +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin + +cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +sudo chmod 2755 gitweb.cgi + +## installing xapian: +download xapian and omega +I needed pcre: sudo ports install pcre + +./configure +make +sudo make install + +## installing omega: +I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. +./configure +make +sudo make install + +## installing Search::Xapian from CPAN +for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. +perl Makefile.PL +make +make test +sudo make install +it installed without issue so I'm baffled why it didn't install from command line. + +## turning on search plugin: +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +find / -name "omega" -print +and found the omega program in +/usr/local/lib/xapian-omega/bin/omega. +Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. + +Then I fell asleep. -- cgit v1.2.3 From 20b94ad9e1f5a401798b6991aeba964267ce3087 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:55:32 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 2c3428b3f..4eb084f38 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -2,44 +2,71 @@ These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a th The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + ## installing git: curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O + tar xzvf git-(latest version).tar.gz + cd git-(latest version) + ./configure --prefix=/usr/local + NO_MSGFMT=yes make prefix=/usr/local all + sudo make install + git config --global user.name "firstname lastname" + git config --global user.email "email here" + git config --global color.ui "auto" + curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. + I like to install test software in /opt. No particular reason. You could install to defaults. + perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 + perl Makefile.PL LIB=/Library/Perl/5.10.0 + make + make install + sudo install -d /opt/ikiwiki + sudo install -m 0644 wikilist /opt/ikiwiki + sudo install -m 0644 auto.setup /opt/ikiwiki + sudo install -m 0644 auto-blog.setup /opt/ikiwiki + when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + ## using git from inside a git folder: + start with git clone, then learn to do the git dance like this. + git pull + make your changes to your clone + git commit -a -m "message here" + git push + When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. ## installing gitweb @@ -47,35 +74,61 @@ When you can't get into the setup page or you get strange behavior after a setup make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ + sudo chmod 2755 gitweb.cgi + ## installing xapian: + download xapian and omega + I needed pcre: sudo ports install pcre ./configure + make + sudo make install + ## installing omega: + I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. + ./configure + make + sudo make install + ## installing Search::Xapian from CPAN + for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. + perl Makefile.PL + make + make test + sudo make install + it installed without issue so I'm baffled why it didn't install from command line. + + ## turning on search plugin: + I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a + find / -name "omega" -print + and found the omega program in + /usr/local/lib/xapian-omega/bin/omega. + Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. + Then I fell asleep. -- cgit v1.2.3 From 46118a983f1253defcda3042821a10ce5046103c Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:24:43 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 35 ++++++++++---------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 4eb084f38..38df19708 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -5,15 +5,17 @@ The best part of installing ikiwiki was learning how to use git. I never used so ## installing git: +cd /opt/ikiwiki/install + curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O tar xzvf git-(latest version).tar.gz cd git-(latest version) -./configure --prefix=/usr/local +./configure --prefix=/usr/local -NO_MSGFMT=yes make prefix=/usr/local all +make prefix=/usr/local all sudo make install @@ -25,31 +27,20 @@ git config --global user.email "email here" git config --global color.ui "auto" -curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /usr/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. -I like to install test software in /opt. No particular reason. You could install to defaults. - - -perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +git clone git://git.ikiwiki.info/ perl Makefile.PL LIB=/Library/Perl/5.10.0 make -make install - -sudo install -d /opt/ikiwiki - -sudo install -m 0644 wikilist /opt/ikiwiki - -sudo install -m 0644 auto.setup /opt/ikiwiki - -sudo install -m 0644 auto-blog.setup /opt/ikiwiki - +sudo make install when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. @@ -71,12 +62,13 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin +cd gitweb -cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" -sudo chmod 2755 gitweb.cgi +cp gitweb.cgi /Library/WebServer/CGI-Executables/ +sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi ## installing xapian: @@ -117,7 +109,6 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a @@ -131,4 +122,4 @@ and found the omega program in Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. -Then I fell asleep. + -- cgit v1.2.3 From 52375d9c080fd5db8106f75d5ca00f3c806644de Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:42:23 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 38df19708..d685af0d0 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -109,6 +109,50 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. +## setup file + +#!/usr/bin/perl +# Ikiwiki setup automator. +# +# This setup file causes ikiwiki to create a wiki, check it into revision +# control, generate a setup file for the new wiki, and set everything up. +# +# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup +# +# By default, it asks a few questions, and confines itself to the user's home +# directory. You can edit it to change what it asks questions about, or to +# modify the values to use site-specific settings. + +require IkiWiki::Setup::Automator; + +our $wikiname="your wiki"; +our $wikiname_short="yourwiki"; +our $rcs="git"; +our $admin="your name"; +use Net::Domain q{hostfqdn}; +our $domain="your.domain"; + +IkiWiki::Setup::Automator->import( +wikiname => $wikiname, +adminuser => [$admin], +rcs => $rcs, +srcdir => "/opt/ikiwiki/$wikiname_short", +destdir => "/Library/WebServer/Documents/$wikiname_short", +repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), +dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", +url => "http://$domain/$wikiname_short", +cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", +cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", +adminemail => "your\@email.com", +add_plugins => [qw{goodstuff websetup}], +disable_plugins => [qw{}], +libdir => "/opt/ikiwiki/.ikiwiki", +rss => 1, +atom => 1, +syslog => 1, +) + + ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a -- cgit v1.2.3 From 29b5c68bbbb35749b5b515266deffe9358ce3b74 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:19:19 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 96 ++++++++++++++------------ 1 file changed, 51 insertions(+), 45 deletions(-) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index d685af0d0..05a9bf6d7 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -64,11 +64,19 @@ When you can't get into the setup page or you get strange behavior after a setup cd gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi +sudo chmod 2755 /Library/WebServer/git-favicon.png +sudo chmod 2755 /Library/WebServer/git-logo.png +sudo chmod 2755 /Library/WebServer/gitweb.css +sudo chmod 2755 /Library/WebServer/gitweb.js ## installing xapian: @@ -108,50 +116,48 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - -## setup file - -#!/usr/bin/perl -# Ikiwiki setup automator. -# -# This setup file causes ikiwiki to create a wiki, check it into revision -# control, generate a setup file for the new wiki, and set everything up. -# -# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup -# -# By default, it asks a few questions, and confines itself to the user's home -# directory. You can edit it to change what it asks questions about, or to -# modify the values to use site-specific settings. - -require IkiWiki::Setup::Automator; - -our $wikiname="your wiki"; -our $wikiname_short="yourwiki"; -our $rcs="git"; -our $admin="your name"; -use Net::Domain q{hostfqdn}; -our $domain="your.domain"; - -IkiWiki::Setup::Automator->import( -wikiname => $wikiname, -adminuser => [$admin], -rcs => $rcs, -srcdir => "/opt/ikiwiki/$wikiname_short", -destdir => "/Library/WebServer/Documents/$wikiname_short", -repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), -dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", -url => "http://$domain/$wikiname_short", -cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", -cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", -adminemail => "your\@email.com", -add_plugins => [qw{goodstuff websetup}], -disable_plugins => [qw{}], -libdir => "/opt/ikiwiki/.ikiwiki", -rss => 1, -atom => 1, -syslog => 1, -) - + + ## setup file + _!/usr/bin/perl + _ Ikiwiki setup automator. + + _ This setup file causes ikiwiki to create a wiki, check it into revision + _ control, generate a setup file for the new wiki, and set everything up. + + _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup + + _By default, it asks a few questions, and confines itself to the user's home + _directory. You can edit it to change what it asks questions about, or to + _modify the values to use site-specific settings. + require IkiWiki::Setup::Automator; + + our $wikiname="your wiki"; + our $wikiname_short="yourwiki"; + our $rcs="git"; + our $admin="your name"; + use Net::Domain q{hostfqdn}; + our $domain="your.domain"; + + IkiWiki::Setup::Automator->import( + wikiname => $wikiname, + adminuser => [$admin], + rcs => $rcs, + srcdir => "/opt/ikiwiki/$wikiname_short", + destdir => "/Library/WebServer/Documents/$wikiname_short", + repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", + url => "http://$domain/$wikiname_short", + cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", + adminemail => "your\@email.com", + add_plugins => [qw{goodstuff websetup}], + disable_plugins => [qw{}], + libdir => "/opt/ikiwiki/.ikiwiki", + rss => 1, + atom => 1, + syslog => 1, + ) + ## turning on search plugin: -- cgit v1.2.3 From 222e1fdc1f62433d290c39e8bb3235167192b062 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:23:08 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 05a9bf6d7..aa89c4f55 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -67,16 +67,26 @@ cd gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ -cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ + +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/ + sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi -sudo chmod 2755 /Library/WebServer/git-favicon.png -sudo chmod 2755 /Library/WebServer/git-logo.png -sudo chmod 2755 /Library/WebServer/gitweb.css -sudo chmod 2755 /Library/WebServer/gitweb.js + +sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png + +sudo chmod 2755 /Library/WebServer/Documents/git-logo.png + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.css + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.js + ## installing xapian: -- cgit v1.2.3 From 1c4eeddb784b4e04abb5364d140684359a56aca3 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:45:48 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index aa89c4f55..50bb2f520 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -171,15 +171,10 @@ it installed without issue so I'm baffled why it didn't install from command lin ## turning on search plugin: -I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory". +I did a "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega". -find / -name "omega" -print - -and found the omega program in - -/usr/local/lib/xapian-omega/bin/omega. - -Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. +Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing. -- cgit v1.2.3 From f57f56fac11f2cbd619b7e2d14944538e9fb34b6 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:17:32 +0000 Subject: add my own way :) --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index d67a9131b..cbea798f1 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,6 +6,10 @@ ---- +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] + +---- + The u32 page is excellent, but I wonder if documenting the procedure here would be worthwhile. Who knows, the remote site might disappear. But also there are some variations on the approach that might be useful: -- cgit v1.2.3 From deb4bb6111beb9004544bc32d4aeb79f6d5768f7 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:24:40 +0000 Subject: date --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/tips') diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index cbea798f1..4a7163eae 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,7 +6,7 @@ ---- -I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15 ---- -- cgit v1.2.3 From dd35d0d28fa2db775b4fd7fef0c587d5abd96e3e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Fri, 15 Oct 2010 14:39:18 +0000 Subject: package systems exist --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn new file mode 100644 index 000000000..ae3969879 --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn @@ -0,0 +1 @@ +If you want do a bunch of manual labor, this is good, but most people probably want to get ikiwiki via a package system. My Mac laptop's ikiwiki is installed from pkgsrc. --[[schmonz]] -- cgit v1.2.3 From 332cb13310dfdc40b4620be7942657c30f63b3c8 Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:05:02 +0000 Subject: Fixes --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 50bb2f520..f755813e3 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -34,8 +34,12 @@ curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | su I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. +cd .. + git clone git://git.ikiwiki.info/ +cd git.ikiwiki.info/ + perl Makefile.PL LIB=/Library/Perl/5.10.0 make -- cgit v1.2.3 From d2b7fcda9a3b302cfabf528e37dd3366030ebb6b Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:38:16 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/tips') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index f755813e3..8b649156d 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -66,7 +66,7 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -cd gitweb +cd ../git-1.7.3.1/gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" -- cgit v1.2.3 From af0bfcc07820008f0387bfd1b35a594ed40a0246 Mon Sep 17 00:00:00 2001 From: "http://pmate.myopenid.com/" Date: Sat, 20 Nov 2010 17:56:35 +0000 Subject: --- doc/tips/nearlyfreespeech/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn index a003760b9..daebee2a0 100644 --- a/doc/tips/nearlyfreespeech/discussion.mdwn +++ b/doc/tips/nearlyfreespeech/discussion.mdwn @@ -9,3 +9,8 @@ BEGIN failed--compilation aborted at (eval 19) line 2. perl is 5.8.9 > This is fixed in 3.1415926. --[[Joey]] + +Hi! +How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here. +But now if I want to upgrade it to a newer version? +Thanks for your incredible work! -- cgit v1.2.3 From c1f3129583ae4a1e3e9ace89ba11c8bf6c308be3 Mon Sep 17 00:00:00 2001 From: "http://pmate.myopenid.com/" Date: Sat, 20 Nov 2010 17:57:56 +0000 Subject: --- doc/tips/nearlyfreespeech/discussion.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'doc/tips') diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn index daebee2a0..73da608be 100644 --- a/doc/tips/nearlyfreespeech/discussion.mdwn +++ b/doc/tips/nearlyfreespeech/discussion.mdwn @@ -10,7 +10,8 @@ perl is 5.8.9 > This is fixed in 3.1415926. --[[Joey]] -Hi! -How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here. -But now if I want to upgrade it to a newer version? + +Hi!
+How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
+But now if I want to upgrade it to a newer version?
Thanks for your incredible work! -- cgit v1.2.3 From 9f8cfe998e5ced7e4b2e1dd819a025b0745935ff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 Nov 2010 14:57:10 -0400 Subject: response --- doc/tips/nearlyfreespeech/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn index 73da608be..0d1f1f082 100644 --- a/doc/tips/nearlyfreespeech/discussion.mdwn +++ b/doc/tips/nearlyfreespeech/discussion.mdwn @@ -15,3 +15,6 @@ Hi!
How can i upgrade my nearlyfreespeech installation of ikiwiki? To install it i have followed your instructions here.
But now if I want to upgrade it to a newer version?
Thanks for your incredible work! + +> You can move `~/ikiwiki` out of the way and then re-download and install +> it ikiwiki. --[[Joey]] -- cgit v1.2.3 From 1739dbe0a8dc943c736d69f3747251ad72a53278 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 Nov 2010 14:57:46 -0400 Subject: úpdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/tips/nearlyfreespeech.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/tips') diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn index 4b3b02eac..a3d1ec678 100644 --- a/doc/tips/nearlyfreespeech.mdwn +++ b/doc/tips/nearlyfreespeech.mdwn @@ -14,7 +14,8 @@ After you [get an account](https://www.nearlyfreespeech.net/about/start.php), create a site using their web interface. Mine is named `ikiwiki-test` and I used their DNS instead of getting my -own, resulting in +own, resulting in . (Not being kept up +anymore.) They gave me 2 cents free funding for signing up, which is enough to pay for 10 megabytes of bandwidth, or about a thousand typical page views, at -- cgit v1.2.3 From f80469c34d8d81e79d4894f7a1789a949bc766c3 Mon Sep 17 00:00:00 2001 From: "http://pmate.myopenid.com/" Date: Sat, 20 Nov 2010 21:44:12 +0000 Subject: --- doc/tips/nearlyfreespeech/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/tips') diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn index 0d1f1f082..b76432566 100644 --- a/doc/tips/nearlyfreespeech/discussion.mdwn +++ b/doc/tips/nearlyfreespeech/discussion.mdwn @@ -18,3 +18,5 @@ Thanks for your incredible work! > You can move `~/ikiwiki` out of the way and then re-download and install > it ikiwiki. --[[Joey]] + +Thanks a lot Joey. :-) -- cgit v1.2.3 From 9a6ddcd5aff22e95115fb86d74184241538d1ad6 Mon Sep 17 00:00:00 2001 From: "http://clkao.org/" Date: Sun, 12 Dec 2010 07:33:25 +0000 Subject: --- doc/tips/psgi.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/tips/psgi.mdwn (limited to 'doc/tips') diff --git a/doc/tips/psgi.mdwn b/doc/tips/psgi.mdwn new file mode 100644 index 000000000..0d2eeefc8 --- /dev/null +++ b/doc/tips/psgi.mdwn @@ -0,0 +1,21 @@ +Here's the app.psgi file if you want to run ikiwiki with [PSGI](http://plackperl.org) instead of apache or other web servers: + + use Plack::App::CGIBin; + use Plack::Builder; + use Plack::App::File; + + builder { + mount '/ikiwiki.cgi' => Plack::App::CGIBin->new(file => './ikiwiki.cgi')->to_app; + enable "Plack::Middleware::Static", + path => sub { s!(^(?:/[^.]*)?/?$)!${1}/index.html! }, + root => '.'; + mount '/' => Plack::App::File->new(root => ".")->to_app; + }; + +Put it in your destdir and now your can run `plackup -p `. + +Note that you should configure your `url` and `cgiurl` to point to the listening address of plackup. + +Also, the app.psgi residing in the destdir means that /app.psgi is accessible from the web server. + +Hopefully some day ikiwiki web ui will speak psgi natively. -- cgit v1.2.3