(no commit message)

[ikiwiki.git] / 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 d685af0d00855aa44fbb5c534c022e25a39332ba..05a9bf6d791087c47047cf7e5de5b6bea355256d 100644 (file)
--- 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: