X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/46118a983f1253defcda3042821a10ce5046103c..aa65300c2f6a22d4372020b4b5b1a04b5842531a:/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn

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..8b649156d 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
@@ -62,14 +66,32 @@ 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/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/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/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:
 
 download xapian and omega
@@ -108,18 +130,55 @@ 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 
-
-find / -name "omega" -print
-
-and found the omega program in 
-
-/usr/local/lib/xapian-omega/bin/omega. 
+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".
 
-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.