From a14c2a9cd0f04062e32c218b799076adaf8b934e Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Thu, 14 Oct 2010 12:25:48 +0000 Subject: [PATCH 01/10] perms --- doc/bugs/More_permission_checking.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/More_permission_checking.mdwn diff --git a/doc/bugs/More_permission_checking.mdwn b/doc/bugs/More_permission_checking.mdwn new file mode 100644 index 000000000..e56cda98b --- /dev/null +++ b/doc/bugs/More_permission_checking.mdwn @@ -0,0 +1,9 @@ +I'm often confused about permissions and I wish ikiwiki could stamp it's foot down and ensure all the permissions are correctly (canonically?) setup. + +I keep ending up having to `sudo chown -R :www-data` and `sudo chmod -R g+w` on srcdir, destdir. I'm never quite sure what is the best practice for the srcdirs' `/srv/git/` is. Currently everything looks like `hendry:www-data` with ug+rw. + +I think I've triggered these problems by (not thinking and) running `ikiwiki --rebuild --setup /home/hendry/.ikiwiki/mywiki.setup` as my user. + +I don't know if there can be some lookup with `/etc/ikiwiki/wikilist`. Though shouldn't everything be under the `www-data` group in reality? + +Also when I use `sudo ikiwiki -setup /etc/ikiwiki/auto.setup`, I think I create a ton of problems for myself since everything is created as the root user, right? And `/etc/ikiwiki/wikilist` doesn't seem to have the latest created wiki added. I have to reluctantly manually do this. From 46118a983f1253defcda3042821a10ce5046103c Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:24:43 +0000 Subject: [PATCH 02/10] --- .../ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) 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. + From 52375d9c080fd5db8106f75d5ca00f3c806644de Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:42:23 +0000 Subject: [PATCH 03/10] --- .../ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) 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 From 29b5c68bbbb35749b5b515266deffe9358ce3b74 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:19:19 +0000 Subject: [PATCH 04/10] --- .../ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 96 ++++++++++--------- 1 file changed, 51 insertions(+), 45 deletions(-) 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: From 222e1fdc1f62433d290c39e8bb3235167192b062 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:23:08 +0000 Subject: [PATCH 05/10] --- .../ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) 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: From 1c4eeddb784b4e04abb5364d140684359a56aca3 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:45:48 +0000 Subject: [PATCH 06/10] --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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. From f57f56fac11f2cbd619b7e2d14944538e9fb34b6 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:17:32 +0000 Subject: [PATCH 07/10] add my own way :) --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) 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: From c8d5b7d2f93464560b2db97b139713eda692320f Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:19:06 +0000 Subject: [PATCH 08/10] --- doc/users/anarcat.wiki | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/anarcat.wiki diff --git a/doc/users/anarcat.wiki b/doc/users/anarcat.wiki new file mode 100644 index 000000000..7ef474ed6 --- /dev/null +++ b/doc/users/anarcat.wiki @@ -0,0 +1 @@ +Hello! I'm anarcat. See [[https://wiki.koumbit.net/TheAnarcat]] to know more about me. From deb4bb6111beb9004544bc32d4aeb79f6d5768f7 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:24:40 +0000 Subject: [PATCH 09/10] date --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ---- 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: [PATCH 10/10] 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 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]]