rename hash and avoid unnecessary hash ref

[git.ikiwiki.info.git] / doc / tips / nearlyfreespeech.mdwn

diff --git a/doc/tips/nearlyfreespeech.mdwn b/doc/tips/nearlyfreespeech.mdwn
index ca1c3d1ef11a6df003b996997525bd4e74810636..4b3b02eac8acbb2e35cfa4c930c9b5c7808f0bac 100644 (file)
--- a/doc/tips/nearlyfreespeech.mdwn
+++ b/doc/tips/nearlyfreespeech.mdwn
@@ -2,6 +2,12 @@
 provider with very cheap pay as you go pricing. Here's how to install ikiwiki
 there if you don't have a dedicated server.
 
 provider with very cheap pay as you go pricing. Here's how to install ikiwiki
 there if you don't have a dedicated server.
 

+Note that you can also follow these instructions, get your wiki set up on
+NearlyFreeSpeech, and then use the [[plugins/Amazon_S3]] plugin to inject
+the static web pages into Amazon S3. Then NearlyFreeSpeech will handle the
+CGI, and S3 will handle the web serving. This might be a more cost effective,
+scalable, or robust solution than using NearlyFreeSpeech alone.
+

 ## Register for an account and set up a site
 
 After you [get an account](https://www.nearlyfreespeech.net/about/start.php),
 ## Register for an account and set up a site
 
 After you [get an account](https://www.nearlyfreespeech.net/about/start.php),


@@ -36,14 +42,20 @@ Use `wget` to [[download]] the ikiwiki tarball. Then unpack it:
 
 ## Install perl modules
 
 
 ## Install perl modules
 

-Use CPAN to install the perl modules it uses into your home directory:
+As an optional step, you can use CPAN to install the perl modules ikiwiki
+uses into your home directory. This should not be necessary, mostly,
+because the system has most modules installed already.
+
+So, you might want to skip this step and come back to it later if ikiwiki
+doesn't work.

 
 

-       PERL5LIB=ikiwiki:ikiwiki/cpan:. PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
-       PERL5LIB=ikiwiki:ikiwiki/cpan:. PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->force(install => "Bundle::IkiWiki::Extras")'
+       PERL5LIB=`pwd`/ikiwiki:`pwd`/ikiwiki/cpan:`pwd`/lib/perl5 PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
+       
+       PERL5LIB=`pwd`/ikiwiki:`pwd`/ikiwiki/cpan:`pwd`/lib/perl5 PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->force(install => "Bundle::IkiWiki::Extras")'

 
 

-(This will take a while. As long as the first command succeeds, ikiwiki will be
-usable. The second command adds extra modules that some plugins use, and
-installation of some of them might fail.)
+This will take a while. As long as the first command succeeds, ikiwiki will be
+usable. The second command adds extra modules that some plugins use, so it's
+ok if installation of some of them fail.

 
 ## Build and install ikiwiki
 
 
 ## Build and install ikiwiki
 


@@ -64,16 +76,16 @@ Here is an example of how I set up a wiki:
 
        mkdir ~/wiki
        cd ~/wiki
 
        mkdir ~/wiki
        cd ~/wiki

-       cp ~/ikiwiki/doc/ikiwiki.setup .

        cp -r ~/ikiwiki/doc/examples/blog/* .
        cp -r ~/ikiwiki/doc/examples/blog/* .

+       ikiwiki -dumpsetup ikiwiki.setup

        nano ikiwiki.setup
        # Set destdir to /home/htdocs
        # Set srcdir to /home/private/wiki
        nano ikiwiki.setup
        # Set destdir to /home/htdocs
        # Set srcdir to /home/private/wiki

-       # Set url to http://yoursite.nfshost.com/ , set cgiurl likewise
-       # Uncomment the `rcs => "git"` line, and the cgi and git
-       # post-update wrapper blocks.
-       # Set the cgi wrapper path to /home/htdocs/ikiwiki.cgi
-       # Set the git wrapper path to /home/private/wiki.git/hooks/post-update
+       # Set url to http://yoursite.nfshost.com/
+       # Set cgiurl to http://yoursite.nfshost.com/ikiwiki.cgi
+       # Uncomment the `rcs => "git"` line.
+       # Set the cgi_wrapper path to /home/htdocs/ikiwiki.cgi
+       # Set the git_wrapper path to /home/private/wiki.git/hooks/post-update

        # Configure the rest to your liking and save the file.
        ikiwiki-makerepo git . ../wiki.git
        ikiwiki -setup ikiwiki.setup
        # Configure the rest to your liking and save the file.
        ikiwiki-makerepo git . ../wiki.git
        ikiwiki -setup ikiwiki.setup


@@ -87,7 +99,7 @@ dollars.
 
 rm -rf ~/ikiwiki*.tar.gz ~/.cpan ~/ikiwiki ~/man ~/lib/perl5/5.8.8
 
 
 rm -rf ~/ikiwiki*.tar.gz ~/.cpan ~/ikiwiki ~/man ~/lib/perl5/5.8.8
 

-That should cut things down to less than 4 megabytes. If you want to save
+That should cut things down to less than 2 megabytes. If you want to save

 even more space, delete unused perl modules from ~/lib/perl5
 
 ## Enjoy!
 even more space, delete unused perl modules from ~/lib/perl5
 
 ## Enjoy!